build BUGFIX package build issues

Also a link for packages in the README added.

Author: michalvasko

README.md

@@ -39,10 +39,11 @@ and it occurs on the `master` branch, the **first response will likely be** to u
 
 ## Packages
 
-We are using openSUSE Build Service to automaticaly prepare binary packages for number of GNU/Linux distros. Check
-[this](https://software.opensuse.org//download.html?project=home%3Aliberouter&package=libyang) page and follow the
-instructions for your distro to install `libyang` package. The `libyang` package is built once a day from the
-master branch. If you want the latest code from the devel branch, install `libyang-experimental` package.
+We are using openSUSE Build Service to automaticaly prepare binary packages for number of GNU/Linux distros.
+There are [libyang](https://software.opensuse.org//download.html?project=home%3Aliberouter&package=libyang)
+packages from current `master` branch (latest release) and
+[libyang-experimental](https://software.opensuse.org/download/package?package=libyang-experimental&project=home%3Aliberouter)
+from the `devel` branch. Both packages are build once per day.
 
 ## Requirements
 

packages/create-package.sh

@@ -41,8 +41,8 @@ if [ "$VERSION" != "$OLDVERSION" ]; then
     git log --since="$logtime" --pretty=format:"  * %s (%aN)%n" | grep "BUGFIX\|CHANGE\|FEATURE" >>debian.changelog
     git log -1  --pretty=format:"%n -- %aN <%aE>  %aD%n" >>debian.changelog
     echo -e "\n" >>debian.changelog
+    cat ../debian.changelog >>debian.changelog
 fi
-cat ../debian.changelog >>debian.changelog
 
 if [ "$VERSION" != "$OLDVERSION" ]; then
     git log -1 --date=format:'%a %b %d %Y' --pretty=format:"* %ad  %aN <%aE>" | tr -d "\n" >>libyang.spec

packages/debian.rules.in

@@ -12,9 +12,8 @@ override_dh_strip:
 	dh_strip -ppython3-yang@PACKAGE_PART_NAME@ --dbg-package=python3-yang@PACKAGE_PART_NAME@-dbg
 
 override_dh_auto_configure:
-	mkdir build
-	cd build
-	cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr -DCMAKE_BUILD_TYPE:String="@BUILD_TYPE@" -DGEN_LANGUAGE_BINDINGS=ON ..
+	cmake -DCMAKE_INSTALL_PREFIX=/usr -DFORCE_INSRC_BUILD=ON -DCMAKE_BUILD_TYPE="@BUILD_TYPE@" -DENABLE_LYD_PRIV=ON \
+	-DGEN_LANGUAGE_BINDINGS=ON .
 
 override_dh_auto_test:
 	ctest --output-on-failure

packages/libyang.spec.in

@@ -14,28 +14,12 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}
     %define with_lang_bind 1
 %endif
 
-%if 0%{?rhel} && 0%{?rhel} < 7
-    # CentOS/RedHat before 7.0 contains old pcre without pcre_free_study().
-    # With cache disabled, this isn't needed
-    %define with_enable_cache 0
-    # CentOS/RedHat before 7.0 contains old valgrind which can't run
-    # valgrind tests. Disable them
-    %define with_valgrind 0
-%else
-    %define with_enable_cache 1
-    %define with_valgrind 1
-%endif
-
 Requires:  pcre
 BuildRequires:  cmake
 BuildRequires:  doxygen
 BuildRequires:  pcre-devel
 BuildRequires:  gcc
 
-%if %{with_valgrind}
-BuildRequires:  valgrind
-%endif
-
 %if %{with_lang_bind}
 BuildRequires:  gcc-c++
 BuildRequires:  swig >= 3.0.12
@@ -44,12 +28,9 @@ BuildRequires:  libcmocka-devel
 %if 0%{?suse_version} + 0%{?fedora} > 0
 BuildRequires:  python3-devel
 %else
-%if 0%{?rhel} && 0%{?rhel} > 7
 BuildRequires:  python36-devel
-%else
-BuildRequires:  python34-devel
-%endif
 %endif
+
 %endif
 
 Conflicts: @CONFLICT_PACKAGE_NAME@ = @LIBYANG_MAJOR_VERSION@.@LIBYANG_MINOR_VERSION@
@@ -101,22 +82,12 @@ cd build
 %else
     %define cmake_lang_bind "-DGEN_LANGUAGE_BINDINGS=OFF"
 %endif
-%if %{with_enable_cache}
-    %define cmake_enable_cache ""
-%else
-    %define cmake_enable_cache "-DENABLE_CACHE=OFF"
-%endif
-%if %{with_valgrind}
-    %define cmake_valgrind ""
-%else
-    %define cmake_valgrind "-DENABLE_VALGRIND_TESTS=OFF"
-%endif
 cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr \
    -DCMAKE_BUILD_TYPE:String="@BUILD_TYPE@" \
    -DENABLE_LYD_PRIV=ON \
    -DGEN_JAVA_BINDINGS=OFF \
    -DGEN_JAVASCRIPT_BINDINGS=OFF \
-   %{cmake_valgrind} %{cmake_lang_bind} %{cmake_enable_cache} ..
+   %{cmake_lang_bind} ..
 make
 
 %check
@@ -129,13 +100,13 @@ make DESTDIR=%{buildroot} install
 
 %post -p /sbin/ldconfig
 %if %{with_lang_bind}
-    %post -n libyang-cpp@PACKAGE_PART_NAME@ -p /sbin/ldconfig
-%endif 
+%post -n libyang-cpp@PACKAGE_PART_NAME@ -p /sbin/ldconfig
+%endif
 
 %postun -p /sbin/ldconfig
 %if %{with_lang_bind}
-    %postun -n libyang-cpp@PACKAGE_PART_NAME@ -p /sbin/ldconfig
-%endif 
+%postun -n libyang-cpp@PACKAGE_PART_NAME@ -p /sbin/ldconfig
+%endif
 
 %files
 %defattr(-,root,root)