Hello community,

here is the log from the commit of package libsigrokdecode for openSUSE:Factory 
checked in at 2014-11-06 16:50:13
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libsigrokdecode (Old)
 and      /work/SRC/openSUSE:Factory/.libsigrokdecode.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "libsigrokdecode"

Changes:
--------
--- /work/SRC/openSUSE:Factory/libsigrokdecode/libsigrokdecode.changes  
2014-08-07 12:37:45.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libsigrokdecode.new/libsigrokdecode.changes     
2014-11-06 16:50:54.000000000 +0100
@@ -1,0 +2,13 @@
+Fri Oct 24 11:26:48 UTC 2014 - dims...@opensuse.org
+
+- Add libsigrokdecode-versioned-decoders.patch: move decoders to
+  a versioned subdirectory.
+- Change RPM Group of the library package to System/Libraries.
+
+-------------------------------------------------------------------
+Thu Oct 23 11:52:31 UTC 2014 - m...@suse.com
+
+- Keep the decoders under /usr/share/libsigrokdecode (unversioned)
+  otherwise the library won't find them.
+
+-------------------------------------------------------------------

New:
----
  libsigrokdecode-versioned-decoders.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ libsigrokdecode.spec ++++++
--- /var/tmp/diff_new_pack.Ilt2MR/_old  2014-11-06 16:50:56.000000000 +0100
+++ /var/tmp/diff_new_pack.Ilt2MR/_new  2014-11-06 16:50:56.000000000 +0100
@@ -25,6 +25,7 @@
 Group:          Productivity/Scientific/Electronics
 Url:            http://sigrok.org
 Source0:        
http://sigrok.org/download/source/libsigrokdecode/%{name}-%{version}.tar.gz
+Patch0:         libsigrokdecode-versioned-decoders.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  check-devel >= 0.9.4
@@ -47,6 +48,7 @@
 
 %package     -n %{libname}
 Summary:        Protocol Decoder Library for sigrok
+Group:          System/Libraries
 Requires:       python3-base
 
 %description -n %{libname}
@@ -75,8 +77,10 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
+autoreconf -fiv
 %configure \
         --disable-static
 make %{?_smp_mflags}
@@ -84,7 +88,6 @@
 %install
 %make_install
 find %{buildroot} -type f -name "*.la" -delete -print
-mv %{buildroot}/%{_datadir}/%{name} %{buildroot}/%{_datadir}/%{libname}
 
 %post -n %{libname} -p /sbin/ldconfig
 
@@ -94,7 +97,7 @@
 %defattr(-,root,root,-)
 %doc COPYING README HACKING NEWS
 %{_libdir}/*.so.*
-%{_datadir}/%{libname}
+%{_datadir}/%{name}-%{version}/
 
 %files devel
 %defattr(-,root,root,-)

++++++ libsigrokdecode-versioned-decoders.patch ++++++
diff -ur libsigrokdecode-0.3.0/configure.ac 
libsigrokdecode-0.3.0.patched/configure.ac
--- libsigrokdecode-0.3.0/configure.ac  2014-05-06 23:08:31.000000000 +0200
+++ libsigrokdecode-0.3.0.patched/configure.ac  2014-10-24 15:20:07.479481279 
+0200
@@ -143,15 +143,15 @@
 # These are already checked: inttypes.h stdint.h stdlib.h string.h unistd.h.
 AC_CHECK_HEADER([sys/resource.h], [], [build_runtc="no"])
 
-AC_SUBST(DECODERS_DIR, "$datadir/libsigrokdecode/decoders")
-AC_SUBST(MAKEFLAGS, '--no-print-directory')
-AC_SUBST(AM_LIBTOOLFLAGS, '--silent')
-
 SRD_PACKAGE_VERSION_MAJOR=srd_package_version_major
 SRD_PACKAGE_VERSION_MINOR=srd_package_version_minor
 SRD_PACKAGE_VERSION_MICRO=srd_package_version_micro
 SRD_PACKAGE_VERSION=srd_package_version
 
+AC_SUBST(DECODERS_DIR, 
"$datadir/libsigrokdecode-${SRD_PACKAGE_VERSION}/decoders")
+AC_SUBST(MAKEFLAGS, '--no-print-directory')
+AC_SUBST(AM_LIBTOOLFLAGS, '--silent')
+
 AC_SUBST(SRD_PACKAGE_VERSION_MAJOR)
 AC_SUBST(SRD_PACKAGE_VERSION_MINOR)
 AC_SUBST(SRD_PACKAGE_VERSION_MICRO)
-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to