Hello community, here is the log from the commit of package dar for openSUSE:12.2 checked in at 2012-07-09 18:26:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.2/dar (Old) and /work/SRC/openSUSE:12.2/.dar.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "dar", Maintainer is "adrian@suse.com" Changes: -------- --- /work/SRC/openSUSE:12.2/dar/dar.changes 2012-06-25 15:17:26.000000000 +0200 +++ /work/SRC/openSUSE:12.2/.dar.new/dar.changes 2012-07-09 18:26:58.000000000 +0200 @@ -1,0 +2,36 @@ +Mon Jul 9 08:50:00 UTC 2012 - cfarrell@suse.com + +- license update: SUSE-GPL-2.0+-with-openssl-exception + The developers of dar included a special exception to link against + openSSL + +------------------------------------------------------------------- +Fri Jul 6 19:43:02 UTC 2012 - dimstar@opensuse.org + +- Remove libdar Requires from the devel package: it's not needed. + Note: this did not cause any issue, as libdar4 provide libdar as + a symbol. +- Package AUTHORS COPYING NEWS TODO ChangeLog as normal %doc files, + without copying them around first. +- Rename libdar-4 subpackage to libdar4, following the SLPP. Change + the rpm group of libdar to System/Libraries. +- Create a -lang package, which is Recommended by libdar. This + actually helps in the future when libdar5 would ever come out. + Currently, due to the language files being part of the library + package, it would be impossible to install multiple versions. +- Pass --disable-static to configure: no need to build it. And as + a result, we also do not have to delete it in install again. +- Add fdupes BuildRequires and use it in %install to link the same + files together. +- Run spec-cleaner. + +------------------------------------------------------------------- +Fri Jul 6 12:42:13 UTC 2012 - dimstar@opensuse.org + +- Add dar-DARWIN.patch: Fix the generation of the installed + config.h header. Our autotools create a config.h.in which also + contains #ifned _DARWIN_*, which is matched by the upstream grep + command, but the matching #endif is not matched... See discussion + and debug on http://lists.opensuse.org/opensuse-packaging/2012-07/msg00042.html. + +------------------------------------------------------------------- New: ---- dar-DARWIN.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dar.spec ++++++ --- /var/tmp/diff_new_pack.LgTBVe/_old 2012-07-09 18:26:58.000000000 +0200 +++ /var/tmp/diff_new_pack.LgTBVe/_new 2012-07-09 18:26:58.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package dar # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,19 +16,30 @@ # - Name: dar -BuildRequires: e2fsprogs-devel gcc-c++ gettext-tools libattr-devel libbz2-devel libtool openssl-devel pkg-config zlib-devel -Url: http://dar.linux.free.fr/ -License: GPL-2.0+ -Group: System/Filesystems -Summary: Backup and Restore Application Version: 2.3.10 -Release: 6 -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: %name-%version.tar.bz2 -Patch: %name.diff +Release: 0 +Summary: Backup and Restore Application +License: SUSE-GPL-2.0+-with-openssl-exception +Group: System/Filesystems +Url: http://dar.linux.free.fr/ +Source0: %{name}-%{version}.tar.bz2 +# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines +Patch0: %{name}.diff +# PATCH-FIX-OPENSUSE dar-DARWIN.patch dimstar@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 +BuildRequires: fdupes +BuildRequires: gcc-c++ +BuildRequires: gettext-tools +BuildRequires: libattr-devel +BuildRequires: libbz2-devel +BuildRequires: libtool +BuildRequires: openssl-devel +BuildRequires: pkg-config +BuildRequires: zlib-devel Recommends: par +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Dar (Disk Archive) is a hardware-independent backup solution. Dar uses @@ -38,14 +49,19 @@ with the libdar library (for example, with KDar, a KDE application). This package contains the command line tools and documentation. -%package -n libdar-4 -License: GPL-2.0+ +%package -n libdar4 Summary: Backup and Restore Application -Group: System/Filesystems +Group: System/Libraries +# We recommend the -lang pack from the library, as the lib itself is also gettextized. The main pack does +# not need the Recommends, as it requires the lib anyway (thus indirectyl Recommends the -lang package). +Recommends: %{name}-lang Provides: libdar = 2.3.10 Obsoletes: libdar < 2.3.10 +# Package renamed to libdar4, according the shared library policy (2012-07-06) during openSUSE 12.2 cycle. +Provides: libdar-4 = %{version} +Obsoletes: libdar-4 < %{version} -%description -n libdar-4 +%description -n libdar4 Dar stands for Disk ARchive and is a hardware independent backup solution. Dar uses catalogs (unlike tar), so it is possible to extract a single file without having to read the whole archive, and it is also @@ -57,11 +73,14 @@ This package contains the library used by Dar and KDar. %package -n libdar-devel -License: GPL-2.0+ Summary: Backup and Restore Application Group: Development/Languages/C and C++ -Requires: libdar-4 = %{version} libdar = %{version} -Requires: glibc-devel openssl-devel libbz2-devel libattr-devel zlib-devel +Requires: glibc-devel +Requires: libattr-devel +Requires: libbz2-devel +Requires: libdar4 = %{version} +Requires: openssl-devel +Requires: zlib-devel %description -n libdar-devel Dar stands for Disk ARchive and is a hardware independent backup @@ -74,52 +93,50 @@ This package contains the library used by Dar and KDar. +%lang_package %prep %setup -q -%patch +%patch0 +%patch1 -p1 %build autoreconf -f -i -v %configure --with-pic --datadir=%_defaultdocdir \ + --disable-static \ --enable-largefile \ --disable-dar-static make %{?_smp_mflags} %install -make DESTDIR=$RPM_BUILD_ROOT install -install -m 0644 AUTHORS COPYING NEWS TODO ChangeLog \ - $RPM_BUILD_ROOT/%_defaultdocdir/%name/ -# Remove duplicate files -rm $RPM_BUILD_ROOT/%_defaultdocdir/%name/dar-differential-backup-mini-howto.*.html -# Remove la files -rm $RPM_BUILD_ROOT/%_libdir/libdar*.la -# Remove .a files -rm $RPM_BUILD_ROOT/%_libdir/libdar*.a +%make_install +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) -mkdir $RPM_BUILD_ROOT/%_defaultdocdir/%name/examples/ -mv $RPM_BUILD_ROOT/%_defaultdocdir/%name/samples/* $RPM_BUILD_ROOT/%_defaultdocdir/%name/examples -%find_lang %name +mkdir %{buildroot}/%_defaultdocdir/%{name}/examples/ +mv %{buildroot}/%_defaultdocdir/%{name}/samples/* %{buildroot}/%_defaultdocdir/%{name}/examples +%fdupes %{buildroot}%{_defaultdocdir}/%{name} +%find_lang %{name} -%post -n libdar-4 -p /sbin/ldconfig +%post -n libdar4 -p /sbin/ldconfig -%postun -n libdar-4 -p /sbin/ldconfig +%postun -n libdar4 -p /sbin/ldconfig %files %defattr(-,root,root) -/usr/bin/* -%_mandir/man1/* -%doc %_defaultdocdir/%name +%doc AUTHORS COPYING NEWS TODO ChangeLog +%{_bindir}/* +%{_mandir}/man1/* + +%files lang -f %{name}.lang -%files -n libdar-4 -f %name.lang +%files -n libdar4 %defattr(-,root,root) -/usr/share/locale/*/LC_MESSAGES/*dar* -%_libdir/libdar*.so.* +%{_libdir}/libdar.so.* %files -n libdar-devel %defattr(-,root,root) -/usr/include/dar -%_libdir/libdar*.so -%_libdir/pkgconfig/libdar*.pc +%{_includedir}/%{name}/ +%{_libdir}/libdar.so +%{_libdir}/pkgconfig/libdar*.pc %changelog ++++++ dar-DARWIN.patch ++++++ Index: dar-2.3.10/src/libdar/Makefile.am =================================================================== --- dar-2.3.10.orig/src/libdar/Makefile.am +++ dar-2.3.10/src/libdar/Makefile.am @@ -54,7 +54,7 @@ install-data-local: for file in $(dist_noinst_DATA) gettext.h my_config.h ; do sed -e 's%#include \"../my_config.h\"%INC_MY_CONFIG_FILE_H%g' "$$file" | sed -e "s%#include \"%#include \"$(pkgincludedir)/%g" | sed -e "s%INC_MY_CONFIG_FILE_H%#include \"$(pkgincludedir)/my_config.h\"%g" > $(DESTDIR)$(pkgincludedir)/"$$file" ; done rm my_config.h gettext.h for file in $(DESTDIR)$(pkgincludedir)/* ; do sed -e 's%HAVE_%LIBDAR_HAS_%g' "$$file" | sed -e 's%PACKAGE%DAR_PACKAGE%g' | sed -e 's%SIZEOF_%LIBDAR_SIZEOF_%g' | sed -e 's%LSTAT_FOLLOWS_SLASHED_SYMLINK%LIBDAR_LSTAT_FOLLOWS_SLASHED_SYMLINK%g' | sed -e 's%VERSION%LIBDAR_VERSION%g' | sed -e 's%MUTEX_WORKS%LIBDAR_MUTEX_WORKS%g' | sed -e 's%OS_BITS%LIBDAR_OS_BITS%g' | sed -e 's%_AVAILABLE%_AVAILABLE_FOR_LIBDAR%g' | sed -e 's%STDC_HEADERS%LIBDAR_STDC_HEADERS%g' | sed -e 's%ENABLE_NLS%DAR_ENABLE_NLS%g' | sed -e 's%HAVE_GETTEXT%DAR_HAS_GETTEXT%g' > "$$file.tmp" && mv "$$file.tmp" "$$file" ; done - grep DAR $(DESTDIR)$(pkgincludedir)/config.h | grep -v "#undef" > $(DESTDIR)$(pkgincludedir)/config.h.tmp + grep DAR $(DESTDIR)$(pkgincludedir)/config.h | grep -v -e "#undef" -e "DARWIN" > $(DESTDIR)$(pkgincludedir)/config.h.tmp mv $(DESTDIR)$(pkgincludedir)/config.h.tmp $(DESTDIR)$(pkgincludedir)/config.h chmod 0644 $(DESTDIR)$(pkgincludedir)/* $(INSTALL) -d $(DESTDIR)$(libdir)/pkgconfig -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org