From 396cf58aaa4f7b1ba93d51086bf4c5b5641b58bb Mon Sep 17 00:00:00 2001 From: Sérgio M. Basto Date: Jul 02 2015 12:03:52 +0000 Subject: Update to 1.17.25 (Debian stable), adjustments following files dpkg-1.17.25/debian/*.install, *.postinst, etc. - Rebased dpkg-perl-libexecdir.patch and dpkg-perl-libexecdir.epel6.patch - Removed old defattr tags. - Added License tag. --- diff --git a/.gitignore b/.gitignore index 46d6960..adfcdfa 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ dpkg_1.15.5.6.tar.bz2 /dpkg_1.16.14.tar.xz /dpkg_1.16.15.tar.xz /dpkg_1.16.16.tar.xz +/dpkg_1.17.25.tar.xz diff --git a/dpkg-perl-libexecdir.epel6.patch b/dpkg-perl-libexecdir.epel6.patch index b430247..4327d42 100644 --- a/dpkg-perl-libexecdir.epel6.patch +++ b/dpkg-perl-libexecdir.epel6.patch @@ -1,6 +1,6 @@ ---- dpkg-1.16.16.epel6/scripts/Makefile.in 2015-04-09 07:47:16.000000000 +0100 -+++ dpkg-1.16.16/scripts/Makefile.in 2015-04-26 01:35:34.275309326 +0100 -@@ -338,7 +392,7 @@ bin_SCRIPTS = \ +--- ./scripts/Makefile.in.orig 2015-04-10 01:37:03.000000000 +0100 ++++ ./scripts/Makefile.in 2015-07-02 04:16:51.404577510 +0100 +@@ -415,7 +415,7 @@ bin_SCRIPTS = \ dpkg-source \ dpkg-vendor @@ -9,12 +9,12 @@ changelog_SCRIPTS = \ changelog/debian -@@ -431,7 +485,7 @@ nobase_dist_perllib_DATA = \ - man3_MANS = - do_perl_subst = $(AM_V_GEN) \ +@@ -516,7 +516,7 @@ do_perl_subst = $(AM_V_GEN) \ sed -e "s:^\#![[:space:]]*/usr/bin/perl:\#!$(PERL):" \ -- -e "s:\$$dpkglibdir[[:space:]]*=[[:space:]]*['\"][^'\"]*['\"]:\$$dpkglibdir=\"$(pkglibdir)\":" \ -+ -e "s:\$$dpkglibdir[[:space:]]*=[[:space:]]*['\"][^'\"]*['\"]:\$$dpkglibdir=\"$(pkglibexecdir)\":" \ - -e "s:\$$pkgdatadir[[:space:]]*=[[:space:]]*['\"][^'\"]*['\"]:\$$pkgdatadir=\"$(pkgdatadir)\":" \ - -e "s:\$$admindir[[:space:]]*=[[:space:]]*['\"][^'\"]*['\"]:\$$admindir=\"$(admindir)\":" \ - -e "s:\$$version[[:space:]]*=[[:space:]]*['\"][^'\"]*[\"']:\$$version=\"$(PACKAGE_VERSION)\":" + -e "s:\$$CONFDIR[[:space:]]*=[[:space:]]*['\"][^'\"]*['\"]:\$$CONFDIR='$(pkgconfdir)':" \ + -e "s:\$$ADMINDIR[[:space:]]*=[[:space:]]*['\"][^'\"]*['\"]:\$$ADMINDIR='$(admindir)':" \ +- -e "s:\$$LIBDIR[[:space:]]*=[[:space:]]*['\"][^'\"]*['\"]:\$$LIBDIR='$(pkglibdir)':" \ ++ -e "s:\$$LIBDIR[[:space:]]*=[[:space:]]*['\"][^'\"]*['\"]:\$$LIBDIR='$(pkglibexecdir)':" \ + -e "s:\$$DATADIR[[:space:]]*=[[:space:]]*['\"][^'\"]*['\"]:\$$DATADIR='$(pkgdatadir)':" \ + -e "s:\$$PROGVERSION[[:space:]]*=[[:space:]]*['\"][^'\"]*[\"']:\$$PROGVERSION='$(PACKAGE_VERSION)':" + diff --git a/dpkg-perl-libexecdir.patch b/dpkg-perl-libexecdir.patch index 8a8fbff..dc27f72 100644 --- a/dpkg-perl-libexecdir.patch +++ b/dpkg-perl-libexecdir.patch @@ -1,6 +1,5 @@ -diff -up ./scripts/Makefile.am.orig ./scripts/Makefile.am ---- ./scripts/Makefile.am.orig 2013-05-17 02:17:58.619324599 -0400 -+++ ./scripts/Makefile.am 2013-05-17 02:18:35.256329078 -0400 +--- ./scripts/Makefile.am.orig 2015-04-09 23:09:22.000000000 +0100 ++++ ./scripts/Makefile.am 2015-07-02 02:45:12.844920000 +0100 @@ -21,7 +21,7 @@ bin_SCRIPTS = \ dpkg-source \ dpkg-vendor @@ -10,12 +9,12 @@ diff -up ./scripts/Makefile.am.orig ./scripts/Makefile.am changelog_SCRIPTS = \ changelog/debian -@@ -115,7 +115,7 @@ man3_MANS = - - do_perl_subst = $(AM_V_GEN) \ +@@ -123,7 +123,7 @@ do_perl_subst = $(AM_V_GEN) \ sed -e "s:^\#![[:space:]]*/usr/bin/perl:\#!$(PERL):" \ -- -e "s:\$$dpkglibdir[[:space:]]*=[[:space:]]*['\"][^'\"]*['\"]:\$$dpkglibdir=\"$(pkglibdir)\":" \ -+ -e "s:\$$dpkglibdir[[:space:]]*=[[:space:]]*['\"][^'\"]*['\"]:\$$dpkglibdir=\"$(pkglibexecdir)\":" \ - -e "s:\$$pkgdatadir[[:space:]]*=[[:space:]]*['\"][^'\"]*['\"]:\$$pkgdatadir=\"$(pkgdatadir)\":" \ - -e "s:\$$admindir[[:space:]]*=[[:space:]]*['\"][^'\"]*['\"]:\$$admindir=\"$(admindir)\":" \ - -e "s:\$$version[[:space:]]*=[[:space:]]*['\"][^'\"]*[\"']:\$$version=\"$(PACKAGE_VERSION)\":" + -e "s:\$$CONFDIR[[:space:]]*=[[:space:]]*['\"][^'\"]*['\"]:\$$CONFDIR='$(pkgconfdir)':" \ + -e "s:\$$ADMINDIR[[:space:]]*=[[:space:]]*['\"][^'\"]*['\"]:\$$ADMINDIR='$(admindir)':" \ +- -e "s:\$$LIBDIR[[:space:]]*=[[:space:]]*['\"][^'\"]*['\"]:\$$LIBDIR='$(pkglibdir)':" \ ++ -e "s:\$$LIBDIR[[:space:]]*=[[:space:]]*['\"][^'\"]*['\"]:\$$LIBDIR='$(pkglibexecdir)':" \ + -e "s:\$$DATADIR[[:space:]]*=[[:space:]]*['\"][^'\"]*['\"]:\$$DATADIR='$(pkgdatadir)':" \ + -e "s:\$$PROGVERSION[[:space:]]*=[[:space:]]*['\"][^'\"]*[\"']:\$$PROGVERSION='$(PACKAGE_VERSION)':" + diff --git a/dpkg.spec b/dpkg.spec index bb0a2da..bd0fe3e 100644 --- a/dpkg.spec +++ b/dpkg.spec @@ -2,8 +2,8 @@ %global pkgdatadir %{_datadir}/dpkg Name: dpkg -Version: 1.16.16 -Release: 6%{?dist} +Version: 1.17.25 +Release: 1%{?dist} Summary: Package maintenance system for Debian Linux Group: System Environment/Base # The entire source code is GPLv2+ with exception of the following @@ -109,7 +109,7 @@ dselect is a high-level interface for the installation/removal of debs . %setup -q %patch0 -p1 %patch1 -p1 -%if 0%{?rhel} <= 6 +%if 0%{?rhel} == 5 || 0%{?rhel} == 6 %patch2 -p1 %endif @@ -160,8 +160,9 @@ ln -sf fedora %{buildroot}/%{pkgconfdir}/origins/default %endif # from debian/dpkg.install -install -pm0644 debian/archtable %{buildroot}/%{pkgdatadir}/archtable +install -pm0644 scripts/mk/*mk %{buildroot}/%{pkgdatadir} install -pm0644 debian/dpkg.cfg %{buildroot}/%{pkgconfdir} +install -pm0644 debian/dselect.cfg %{buildroot}/%{pkgconfdir} install -pm0644 debian/shlibs.default %{buildroot}/%{pkgconfdir} install -pm0644 debian/shlibs.override %{buildroot}/%{pkgconfdir} @@ -213,11 +214,10 @@ create_database create_logfile -%files -f dpkg.lang -%defattr(-,root,root,-) +%files -f dpkg.lang %doc debian/changelog README AUTHORS THANKS TODO -%doc debian/copyright debian/usertags -%doc doc/README.feature-removal-schedule doc/triggers.txt +%doc doc/README.feature-removal-schedule debian/usertags debian/dpkg.cron.daily +%license debian/copyright %dir %{pkgconfdir} %dir %{pkgconfdir}/dpkg.cfg.d %dir %{pkgconfdir}/origins @@ -234,10 +234,10 @@ create_logfile %{_bindir}/dpkg-statoverride %dir %{pkgdatadir} %{pkgdatadir}/abitable -%{pkgdatadir}/archtable %{pkgdatadir}/cputable %{pkgdatadir}/ostable %{pkgdatadir}/triplettable +%{pkgdatadir}/*mk %dir %{_localstatedir}/lib/dpkg/alternatives %dir %{_localstatedir}/lib/dpkg/info %dir %{_localstatedir}/lib/dpkg/parts @@ -262,14 +262,13 @@ create_logfile %{_mandir}/*/man8/dpkg-statoverride.8.gz %files devel -%defattr(-,root,root,-) %{_libdir}/libdpkg.a +%exclude %{_libdir}/libdpkg.la %{_libdir}/pkgconfig/libdpkg.pc %{_includedir}/dpkg/*.h -%files dev -%defattr(-,root,root,-) -%doc doc/README.api doc/coding-style.txt doc/frontend.txt +%files dev -f dpkg-dev.lang +%doc AUTHORS THANKS debian/usertags doc/README.api doc/README.feature-removal-schedule doc/frontend.txt doc/triggers.txt %config(noreplace) %{pkgconfdir}/shlibs.default %config(noreplace) %{pkgconfdir}/shlibs.override %{_bindir}/dpkg-architecture @@ -349,26 +348,32 @@ create_logfile %{_mandir}/*/man5/deb-version.5.gz %{_mandir}/*/man5/deb.5.gz -%files perl -f dpkg-dev.lang -%defattr(-,root,root,-) +%files perl %{perl_vendorlib}/Dpkg* %{_mandir}/man3/Dpkg*.3* %files -n dselect -f dselect.lang -%defattr(-,root,root,-) %doc dselect/methods/multicd/README.multicd dselect/methods/ftp/README.mirrors.txt +%config(noreplace) %{pkgconfdir}/dselect.cfg %{_bindir}/dselect -%{perl_vendorlib}/Debian +%{perl_vendorlib}/Dselect %{_libdir}/dpkg/methods %{_mandir}/man1/dselect.1.gz %{_mandir}/*/man1/dselect.1.gz %{_mandir}/man5/dselect.cfg.5.gz %{_mandir}/*/man5/dselect.cfg.5.gz %dir %{pkgconfdir}/dselect.cfg.d -%{_localstatedir}/lib/dpkg/methods +%dir %{_localstatedir}/lib/dpkg/methods %changelog +* Thu Jul 02 2015 Sérgio Basto - 1.17.25-1 +- Update to 1.17.25 (Debian stable), adjustments following files + dpkg-1.17.25/debian/*.install, *.postinst, etc. +- Rebased dpkg-perl-libexecdir.patch and dpkg-perl-libexecdir.epel6.patch +- Removed old defattr tags. +- Added License tag. + * Wed Jun 17 2015 Fedora Release Engineering - 1.16.16-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index 13ad236..d17d0ea 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -88d0e4c98ecb8afe6dee896a2aa9665d dpkg_1.16.16.tar.xz +e48fcfdb2162e77d72c2a83432d537ca dpkg_1.17.25.tar.xz