Accepting request 136338 from home:flichtenheld

Update to current and fixing build on Fedora

OBS-URL: https://build.opensuse.org/request/show/136338
OBS-URL: https://build.opensuse.org/package/show/system:packagemanager/dpkg?expand=0&rev=2

dpkg.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Thu Sep 27 21:55:24 UTC 2012 - frank.lichtenheld@sophos.com
+
+- update to dpkg-1.16.8
+* only translation updates
+* see /usr/share/doc/packages/dpkg/changelog for details
+- simplify spec file by removing redundant %if clauses
+- only use Supplements: on SUSE, Fedora doesn't know it
+
 -------------------------------------------------------------------
 Fri Jul  6 23:07:56 UTC 2012 - frank.lichtenheld@sophos.com
 

dpkg.spec

@@ -19,7 +19,7 @@
 %define admindir %{_localstatedir}/lib/rpm/
 
 Name:           dpkg
-Version:        1.16.7
+Version:        1.16.8
 Release:        0
 Summary:        Debian package management system
 License:        GPL-2.0+
@@ -34,6 +34,8 @@ Patch2:         dpkg-archtable-suse.patch
 # PATCH-FIX-UPSTREAM remove --utf8 since we only build En manpages.
 Patch3:         dpkg-pod2man-no-utf8.patch
 BuildRequires:  gcc-c++
+BuildRequires:  libselinux-devel
+%define use_selinux 1
 BuildRequires:  ncurses-devel
 BuildRequires:  xz
 BuildRequires:  zlib-devel
@@ -54,24 +56,10 @@ BuildRequires:  update-alternatives
 Requires:       update-alternatives
 Requires:       perl(Date::Parse)
 Requires:       perl = %{perl_version}
-BuildRequires:  libselinux-devel
-%define use_selinux 1
 %if 0%{?suse_version} < 1120
 %define _libexecdir /usr/lib
 %endif
 %endif
-%if 0%{?fedora_version}
-BuildRequires:  libselinux-devel
-%define use_selinux 1
-%endif
-%if 0%{?rhel_version}
-BuildRequires:  libselinux-devel
-%define use_selinux 1
-%endif
-%if 0%{?centos_version}
-BuildRequires:  libselinux-devel
-%define use_selinux 1
-%endif
 
 %description
 This package contains tools for working with Debian packages. It makes
@@ -98,12 +86,14 @@ 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})
-%if 0%{?suse_version} && 0%{?suse_version} < 1120
+%if 0%{?suse_version} < 1120
 # BuildArch: noarch not supported on SLE 11
 %else
 BuildArch: noarch
 %endif
+%endif
 
 %description lang
 Provides translations to the package %{name}

dpkg_1.16.7.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a14eddcc84279798d9d7c0e048765b75e8cfd75d483737a6845524219e0f3fc0
-size 3587900

dpkg_1.16.8.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4a1f4611390d93f1f198d910d3a4e4913b3cf81702b31f585a1872ca98df0eaa
+size 3601652

update-alternatives.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Sep 27 21:58:39 UTC 2012 - frank.lichtenheld@sophos.com
+
+- update to 1.16.8
+
 -------------------------------------------------------------------
 Fri Jul  6 23:15:06 UTC 2012 - frank.lichtenheld@sophos.com
 

update-alternatives.spec

@@ -19,7 +19,7 @@
 %define admindir %{_localstatedir}/lib/rpm/
 
 Name:           update-alternatives
-Version:        1.16.7
+Version:        1.16.8
 Release:        0
 Summary:        Maintain symbolic links determining default commands
 License:        GPL-2.0+