commit dpkg for openSUSE:Factory
Hello community, here is the log from the commit of package dpkg for openSUSE:Factory checked in at 2015-04-07 09:28:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dpkg (Old) and /work/SRC/openSUSE:Factory/.dpkg.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "dpkg" Changes: -------- --- /work/SRC/openSUSE:Factory/dpkg/dpkg.changes 2015-03-03 11:12:49.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.dpkg.new/dpkg.changes 2015-04-07 09:28:14.000000000 +0200 @@ -1,0 +2,12 @@ +Wed Apr 1 12:59:58 UTC 2015 - tchvatal@suse.com + +- Cleanup a bit with-spec-cleaner help + +------------------------------------------------------------------- +Wed Apr 1 12:54:48 UTC 2015 - tchvatal@suse.com + +- Version bump to 1.17.24: + * Translation updates + * Various small fixes + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/dpkg/update-alternatives.changes 2015-03-03 11:12:49.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.dpkg.new/update-alternatives.changes 2015-04-07 09:28:14.000000000 +0200 @@ -1,0 +2,12 @@ +Wed Apr 1 12:57:51 UTC 2015 - tchvatal@suse.com + +- Cleanup with spec-cleaner + +------------------------------------------------------------------- +Wed Apr 1 12:55:43 UTC 2015 - tchvatal@suse.com + +- Update to 1.11.24: + * Translation updates + * Various small fixes + +------------------------------------------------------------------- Old: ---- dpkg_1.17.23.tar.xz New: ---- dpkg_1.17.24.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dpkg.spec ++++++ --- /var/tmp/diff_new_pack.wazLR7/_old 2015-04-07 09:28:15.000000000 +0200 +++ /var/tmp/diff_new_pack.wazLR7/_new 2015-04-07 09:28:15.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package dpkg # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX 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,9 +17,8 @@ %define admindir %{_localstatedir}/lib/rpm/ - Name: dpkg -Version: 1.17.23 +Version: 1.17.24 Release: 0 Summary: Debian package management system License: GPL-2.0+ @@ -32,9 +31,10 @@ # PATCH-FIX-UPSTREAM remove --utf8 since we only build En manpages. Patch6: dpkg-sparc.diff BuildRequires: gcc-c++ +BuildRequires: libbz2-devel BuildRequires: libselinux-devel -%define use_selinux 1 BuildRequires: ncurses-devel +BuildRequires: update-alternatives BuildRequires: xz BuildRequires: zlib-devel BuildRequires: perl(Date::Parse) @@ -42,22 +42,17 @@ Requires: cpio Requires: make Requires: patch +Requires: perl = %{perl_version} +Requires: update-alternatives +Requires: perl(Date::Parse) +Requires(pre): /bin/touch +Recommends: perl(File::FcntlLock) Provides: deb = %{version} Obsoletes: deb < %{version} Provides: dpkg-dev = %{version} Provides: dpkg-doc = %{version} Provides: dselect = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build -Requires(pre): /bin/touch - -%if 0%{?suse_version} -BuildRequires: libbz2-devel -BuildRequires: update-alternatives -Requires: perl = %{perl_version} -Requires: update-alternatives -Requires: perl(Date::Parse) -Recommends: perl(File::FcntlLock) -%endif %description This package contains tools for working with Debian packages. It makes @@ -70,43 +65,26 @@ %package devel Summary: Development files for dpkg Group: Development/Libraries/C and C++ +Requires: %{name} = %{version} Provides: deb-devel = %{version} Obsoletes: deb-devel < %{version} -Requires: %{name} = %{version} %description devel Libraries and header files for dpkg. -%package lang -Summary: Languages for package %{name} -Group: System/Localization -Requires: %{name} = %{version} -Provides: %{name}-lang-all = %{version} -Provides: deb-lang = %{version} -Obsoletes: deb-lang < %{version} -%if %{defined suse_version} -Supplements: packageand(bundle-lang-other:%{name}) -BuildArch: noarch -%endif - -%description lang -Provides translations to the package %{name} +%lang_package %prep %setup -q - %patch1 -p1 %patch6 -p1 %build export CFLAGS="%{optflags}" -%if 0%{?use_selinux} export SELINUX_LIBS="-lselinux" -%endif -%{configure}\ -%if 0%{?use_selinux} +%configure \ + --disable-silent-rules \ --with-selinux \ -%endif --localstatedir=%{_localstatedir}/lib \ --with-admindir=%{_localstatedir}/lib/dpkg @@ -132,7 +110,7 @@ make %{?_smp_mflags} %install -%{__make} install DESTDIR=%{?buildroot} +make install DESTDIR=%{?buildroot} # remove update-alternatives stuff (included in separate package) rm -rf %{buildroot}%{_sysconfdir}/alternatives @@ -143,16 +121,16 @@ rm -rf %{buildroot}%{_mandir}/*/man8/update-alternatives.8 # locales -%{find_lang} %{name} -%{find_lang} dselect -%{find_lang} dpkg-dev +%find_lang %{name} +%find_lang dselect +%find_lang dpkg-dev cat dselect.lang dpkg-dev.lang >> %{name}.lang # extras install -m 755 %{SOURCE3} %{buildroot}%{_bindir} %check -%{__make} check +make %{?_smp_mflags} check %post cd %{_localstatedir}/lib/dpkg @@ -162,6 +140,7 @@ exit 0 %files lang -f %{name}.lang +%defattr(-,root,root) %files %defattr(-,root,root) ++++++ update-alternatives.spec ++++++ --- /var/tmp/diff_new_pack.wazLR7/_old 2015-04-07 09:28:15.000000000 +0200 +++ /var/tmp/diff_new_pack.wazLR7/_new 2015-04-07 09:28:15.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package update-alternatives # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX 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,9 +17,8 @@ %define admindir %{_localstatedir}/lib/rpm/ - Name: update-alternatives -Version: 1.17.23 +Version: 1.17.24 Release: 0 Summary: Maintain symbolic links determining default commands License: GPL-2.0+ @@ -46,12 +45,12 @@ %prep %setup -q -n dpkg-%{version} - %patch0 -p1 %patch6 -p1 %build -%{configure} \ +%configure \ + --disable-silent-rules \ --with-admindir=%{admindir} make -C lib/compat %{?_smp_mflags} ++++++ dpkg_1.17.23.tar.xz -> dpkg_1.17.24.tar.xz ++++++ ++++ 8281 lines of diff (skipped)
participants (1)
-
root@hilbert.suse.de