Hello community, here is the log from the commit of package dar for openSUSE:Factory checked in at 2013-06-05 11:47:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2012-07-09 18:26:53.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.dar.new/dar.changes 2013-06-05 11:47:45.000000000 +0200 @@ -1,0 +2,9 @@ +Mon Jun 3 07:16:23 UTC 2013 - adrian@suse.de + +- update to version 2.4.10 + * Extensive changelog can be found in Changelog file +- enable lzo compression support +- enable strong encryption support via gcrypt +- rename lib package to follow so name change + +------------------------------------------------------------------- Old: ---- dar-2.3.10.tar.bz2 New: ---- dar-2.4.10.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dar.spec ++++++ --- /var/tmp/diff_new_pack.5UoolB/_old 2013-06-05 11:47:46.000000000 +0200 +++ /var/tmp/diff_new_pack.5UoolB/_new 2013-06-05 11:47:46.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package dar # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 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 @@ -17,13 +17,13 @@ Name: dar -Version: 2.3.10 +Version: 2.4.10 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 +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 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. @@ -34,9 +34,14 @@ BuildRequires: gettext-tools BuildRequires: libattr-devel BuildRequires: libbz2-devel +BuildRequires: libgcrypt-devel BuildRequires: libtool +BuildRequires: lzo-devel BuildRequires: openssl-devel BuildRequires: pkg-config +%ifarch %ix86 x86_64 ppc +BuildRequires: upx +%endif BuildRequires: zlib-devel Recommends: par BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -49,7 +54,7 @@ with the libdar library (for example, with KDar, a KDE application). This package contains the command line tools and documentation. -%package -n libdar4 +%package -n libdar5000 Summary: Backup and Restore Application Group: System/Libraries # We recommend the -lang pack from the library, as the lib itself is also gettextized. The main pack does @@ -58,10 +63,13 @@ 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} +Provides: libdar-4 = 2.3.10 +Obsoletes: libdar-4 < 2.3.10 +# Package renamed to libdar5000, following so name change +Provides: libdar4 = %{version} +Obsoletes: libdar4 < %{version} -%description -n libdar4 +%description -n libdar5000 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 @@ -78,7 +86,7 @@ Requires: glibc-devel Requires: libattr-devel Requires: libbz2-devel -Requires: libdar4 = %{version} +Requires: libdar5000 = %{version} Requires: openssl-devel Requires: zlib-devel @@ -117,9 +125,9 @@ %fdupes %{buildroot}%{_defaultdocdir}/%{name} %find_lang %{name} -%post -n libdar4 -p /sbin/ldconfig +%post -n libdar5000 -p /sbin/ldconfig -%postun -n libdar4 -p /sbin/ldconfig +%postun -n libdar5000 -p /sbin/ldconfig %files %defattr(-,root,root) @@ -129,9 +137,10 @@ %files lang -f %{name}.lang -%files -n libdar4 +%files -n libdar5000 %defattr(-,root,root) %{_libdir}/libdar.so.* +%config(noreplace) /etc/darrc %files -n libdar-devel %defattr(-,root,root) ++++++ dar-DARWIN.patch ++++++ --- /var/tmp/diff_new_pack.5UoolB/_old 2013-06-05 11:47:46.000000000 +0200 +++ /var/tmp/diff_new_pack.5UoolB/_new 2013-06-05 11:47:46.000000000 +0200 @@ -1,13 +1,13 @@ -Index: dar-2.3.10/src/libdar/Makefile.am +Index: dar-2.4.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 +--- dar-2.4.10.orig/src/libdar/Makefile.am ++++ dar-2.4.10/src/libdar/Makefile.am +@@ -59,7 +59,7 @@ install-data-local: + for file in $(dist_noinst_DATA) gettext.h libdar_my_config.h ; do sed -e 's%#include \"../my_config.h\"%INC_MY_CONFIG_FILE_H%g' -e "s%#include \"%#include \"$(pkgincludedir)/%g" -e "s%INC_MY_CONFIG_FILE_H%#include \"$(pkgincludedir)/libdar_my_config.h\"%g" "$$file" > $(DESTDIR)$(pkgincludedir)/"$$file" ; done + rm libdar_my_config.h gettext.h + for file in $(DESTDIR)$(pkgincludedir)/* ; do sed -e 's%HAVE_%LIBDAR_HAS_%g' -e 's%PACKAGE%DAR_PACKAGE%g' -e 's%SIZEOF_%LIBDAR_SIZEOF_%g' -e 's%LSTAT_FOLLOWS_SLASHED_SYMLINK%LIBDAR_LSTAT_FOLLOWS_SLASHED_SYMLINK%g' -e 's%VERSION%LIBDAR_VERSION%g' -e 's%MUTEX_WORKS%LIBDAR_MUTEX_WORKS%g' -e 's%OS_BITS%LIBDAR_OS_BITS%g' -e 's%_AVAILABLE%_AVAILABLE_FOR_LIBDAR%g' -e 's%STDC_HEADERS%LIBDAR_STDC_HEADERS%g' -e 's%ENABLE_NLS%DAR_ENABLE_NLS%g' -e 's%HAVE_GETTEXT%DAR_HAS_GETTEXT%g' "$$file" > "$$file.tmp" && mv "$$file.tmp" "$$file" ; done +- grep DAR $(DESTDIR)$(pkgincludedir)/libdar_config.h | grep -v "#undef" > $(DESTDIR)$(pkgincludedir)/config.h.tmp ++ grep DAR $(DESTDIR)$(pkgincludedir)/libdar_config.h | grep -v -e "#undef" -e "DARWIN" > $(DESTDIR)$(pkgincludedir)/config.h.tmp + mv $(DESTDIR)$(pkgincludedir)/config.h.tmp $(DESTDIR)$(pkgincludedir)/libdar_config.h chmod 0644 $(DESTDIR)$(pkgincludedir)/* $(INSTALL) -d $(DESTDIR)$(libdir)/pkgconfig ++++++ dar.diff ++++++ --- /var/tmp/diff_new_pack.5UoolB/_old 2013-06-05 11:47:46.000000000 +0200 +++ /var/tmp/diff_new_pack.5UoolB/_new 2013-06-05 11:47:46.000000000 +0200 @@ -1,11 +1,13 @@ ---- configure.ac +Index: configure.ac +=================================================================== +--- configure.ac.orig +++ configure.ac -@@ -8,7 +8,7 @@ - +@@ -8,7 +8,7 @@ AC_DEFINE_UNQUOTED(DAR_VERSION, "AC_PACK + AM_INIT_AUTOMAKE AM_GNU_GETTEXT([external]) -AM_GNU_GETTEXT_VERSION -+AM_GNU_GETTEXT_VERSION(0.17) - AM_ICONV - ++AM_GNU_GETTEXT_VERSION(0.18) + XGETTEXT_EXTRA_OPTIONS='--keyword=dar_gettext' + # Checks for programs. -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org