Hello community, here is the log from the commit of package dar for openSUSE:Factory checked in at 2013-08-27 20:40:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dar (Old) and /work/SRC/openSUSE:Factory/.dar.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dar" Changes: -------- --- /work/SRC/openSUSE:Factory/dar/dar.changes 2013-06-05 11:47:45.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.dar.new/dar.changes 2013-08-27 20:40:13.000000000 +0200 @@ -1,0 +2,10 @@ +Mon Aug 19 07:45:53 UTC 2013 - adr...@suse.de + +- fix build with old gettext (SLE 11) + +------------------------------------------------------------------- +Mon Aug 19 07:19:53 UTC 2013 - adr...@suse.de + +- enforce and test for dynamic linking. (bnc#835318) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dar.spec ++++++ --- /var/tmp/diff_new_pack.RNJR74/_old 2013-08-27 20:40:14.000000000 +0200 +++ /var/tmp/diff_new_pack.RNJR74/_new 2013-08-27 20:40:14.000000000 +0200 @@ -24,8 +24,6 @@ Group: System/Filesystems Url: http://dar.linux.free.fr/ Source0: %{name}-%{version}.tar.gz -# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines -Patch0: %{name}.diff # PATCH-FIX-OPENSUSE dar-DARWIN.patch dims...@opensuse.org -- Something goes wrong in the build and the installed config.h is corrupted (due to grep DAR, which also matches DARWIN, but the #endif is not matched. Patch in this form not suitable for upstream. Patch1: dar-DARWIN.patch BuildRequires: e2fsprogs-devel @@ -104,8 +102,13 @@ %lang_package %prep %setup -q -%patch0 %patch1 -p1 +%if 0%{suse_version} > 1200 +sed -i -e 's,^AM_GNU_GETTEXT_VERSION.*,-AM_GNU_GETTEXT_VERSION(0.18),' configure.ac +%else +# sle 11 +sed -i -e 's,^AM_GNU_GETTEXT_VERSION.*,-AM_GNU_GETTEXT_VERSION(0.17),' configure.ac +%endif %build autoreconf -f -i -v @@ -115,8 +118,20 @@ --disable-dar-static make %{?_smp_mflags} +%check +# ensure that dynamic linked binaries get installed +file $RPM_BUILD_ROOT/usr/bin/* | grep -q dynamic || exit 1 +file $RPM_BUILD_ROOT/usr/bin/* | grep -q static && exit 1 + %install +%if 0%{suse_version} > 1200 %make_install +%else +make install DESTDIR=$RPM_BUILD_ROOT +%endif +# libtool make executables static during installation +# overwrite them with original dynamic linked binaries +install -m 0755 src/dar_suite/.libs/* $RPM_BUILD_ROOT/usr/bin/ find %{buildroot}%{_libdir} -name '*.la' -delete -print # Move the sample scripts to the correct location (otherwise rpmlint will error due to these scripts having execute perms) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
