sergiomb pushed to dpkg (epel7). "some fixes and support for epel-6"

[notifications at fedoraproject.org]

>From bb213aa03a3c29fd51edb2c6aa67cb1217090996 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9rgio=20Basto?= <sergio at serjux.com>
Date: Tue, 21 Apr 2015 02:55:21 +0100
Subject: some fixes and support for epel-6


diff --git a/dpkg-perl-libexecdir.patch b/dpkg-perl-libexecdir.patch
deleted file mode 100644
index 8a8fbff..0000000
--- a/dpkg-perl-libexecdir.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-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
-@@ -21,7 +21,7 @@ bin_SCRIPTS = \
- 	dpkg-source \
- 	dpkg-vendor
- 
--changelogdir = $(pkglibdir)/parsechangelog
-+changelogdir = $(pkglibexecdir)/parsechangelog
- changelog_SCRIPTS = \
- 	changelog/debian
- 
-@@ -115,7 +115,7 @@ man3_MANS =
- 
- 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)\":"
diff --git a/dpkg.logrotate b/dpkg.logrotate
deleted file mode 100644
index b071698..0000000
--- a/dpkg.logrotate
+++ /dev/null
@@ -1,18 +0,0 @@
-/var/log/dpkg.log {
-	monthly
-	rotate 12
-	compress
-	delaycompress
-	missingok
-	notifempty
-	create 644 root root
-}
-/var/log/alternatives.log {
-	monthly
-	rotate 12
-	compress
-	delaycompress
-	missingok
-	notifempty
-	create 644 root root
-}
diff --git a/dpkg.spec b/dpkg.spec
index 857d282..4f4f12e 100644
--- a/dpkg.spec
+++ b/dpkg.spec
@@ -3,7 +3,7 @@
 
 Name:           dpkg
 Version:        1.16.16
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Package maintenance system for Debian Linux
 Group:          System Environment/Base
 # The entire source code is GPLv2+ with exception of the following
@@ -15,11 +15,13 @@ Group:          System Environment/Base
 License:        GPLv2 and GPLv2+ and LGPLv2+ and Public Domain and BSD
 URL:            http://packages.debian.org/unstable/admin/dpkg
 Source0:        http://ftp.debian.org/debian/pool/main/d/dpkg/%{name}_%{version}.tar.xz
-Patch0:         dpkg-perl-libexecdir.patch
 Patch1:         dpkg-fix-logrotate.patch
 BuildRequires:  zlib-devel bzip2-devel libselinux-devel gettext ncurses-devel
 BuildRequires:  autoconf automake gettext-devel
-BuildRequires:  doxygen flex xz-devel po4a dotconf-devel
+BuildRequires:  doxygen flex xz-devel po4a
+%if 0%{?rhel} != 5 && 0%{?rhel} != 6
+BuildRequires:  dotconf-devel
+%endif
 # for /usr/bin/pod2man
 %if 0%{?fedora} > 18
 BuildRequires: perl-podlators
@@ -104,7 +106,6 @@ dselect is a high-level interface for the installation/removal of debs .
 
 %prep
 %setup -q
-%patch0 -p1
 %patch1 -p1
 
 # Filter unwanted Requires:
@@ -118,7 +119,9 @@ EOF
 chmod +x %{__perl_requires}
 
 %build
+%if 0%{?rhel} != 5 && 0%{?rhel} != 6
 autoreconf -fiv
+%endif
 %configure --disable-start-stop-daemon \
         --disable-linker-optimisations \
         --with-admindir=%{_localstatedir}/lib/dpkg \
@@ -275,7 +278,7 @@ create_logfile
 %{_bindir}/dpkg-shlibdeps
 %{_bindir}/dpkg-source
 %{_bindir}/dpkg-vendor
-%{_libexecdir}/dpkg/parsechangelog
+%{_libdir}/dpkg/parsechangelog
 %{pkgdatadir}/*.mk
 %{_mandir}/man1/dpkg-architecture.1.gz
 %{_mandir}/man1/dpkg-buildflags.1.gz
@@ -356,6 +359,9 @@ create_logfile
 
 
 %changelog
+* Tue Apr 21 2015 Sérgio Basto <sergio at serjux.com> - 1.16.16-2
+- some fixes and support for epel-6
+
 * Sun Apr 19 2015 Sérgio Basto <sergio at serjux.com> - 1.16.16-1
 - Security update to 1.16.16
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/dpkg.git/commit/?h=epel7&id=bb213aa03a3c29fd51edb2c6aa67cb1217090996