Accepting request 293979 from system:packagemanager
- Cleanup a bit with-spec-cleaner help - Version bump to 1.17.24: * Translation updates * Various small fixes - Cleanup with spec-cleaner - Update to 1.11.24: * Translation updates * Various small fixes OBS-URL: https://build.opensuse.org/request/show/293979 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dpkg?expand=0&rev=12
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
7cff10f7c4
12
dpkg.changes
12
dpkg.changes
@ -1,3 +1,15 @@
|
||||
-------------------------------------------------------------------
|
||||
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
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jan 5 15:30:22 UTC 2015 - p.drouand@gmail.com
|
||||
|
||||
|
||||
63
dpkg.spec
63
dpkg.spec
@ -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 @@ Patch1: update-alternatives-suse.patch
|
||||
# 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 @@ BuildRequires: perl(IO::String)
|
||||
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,44 +65,27 @@ dpkg-doc, dpkg-dev.
|
||||
%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}
|
||||
--with-selinux \
|
||||
%endif
|
||||
--localstatedir=%{_localstatedir}/lib \
|
||||
%configure \
|
||||
--disable-silent-rules \
|
||||
--with-selinux \
|
||||
--localstatedir=%{_localstatedir}/lib \
|
||||
--with-admindir=%{_localstatedir}/lib/dpkg
|
||||
|
||||
# configure somehow does not detect architecture correctly in OBS (bnc#469337), so
|
||||
@ -132,7 +110,7 @@ sed -i 's/^#define ARCHITECTURE ""/#define ARCHITECTURE "%{debarch}"/' config.h
|
||||
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
|
||||
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 @@ done
|
||||
exit 0
|
||||
|
||||
%files lang -f %{name}.lang
|
||||
%defattr(-,root,root)
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:90c4af92fc248a7542cf6db1141d69b042130abd82781943b3c2608e78f860b5
|
||||
size 4386124
|
||||
3
dpkg_1.17.24.tar.xz
Normal file
3
dpkg_1.17.24.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:afd60233ef090aa5a4d9e181b8986d1f5deb23a3428a2309b6b4ec448d539eac
|
||||
size 4388276
|
||||
@ -1,3 +1,15 @@
|
||||
-------------------------------------------------------------------
|
||||
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
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 17 13:38:47 UTC 2015 - p.drouand@gmail.com
|
||||
|
||||
|
||||
@ -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 @@ particular preference.
|
||||
|
||||
%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}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user