sergiomb pushed to dpkg (epel7). "Now (..more)"

[notifications at fedoraproject.org]

>From 710d25f2ec743a7a0063f873ca0a06d7fe52d127 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9rgio=20Basto?= <sergio at serjux.com>
Date: Fri, 17 May 2013 21:57:38 +0100
Subject: Now - dpkg-perl must be arched.


diff --git a/dpkg-perl-libexecdir.patch b/dpkg-perl-libexecdir.patch
new file mode 100644
index 0000000..8a8fbff
--- /dev/null
+++ b/dpkg-perl-libexecdir.patch
@@ -0,0 +1,21 @@
+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.spec b/dpkg.spec
index 456e119..49ae53e 100644
--- a/dpkg.spec
+++ b/dpkg.spec
@@ -1,6 +1,6 @@
 Name:           dpkg
 Version:        1.16.10
-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
@@ -12,6 +12,7 @@ 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
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  zlib-devel bzip2-devel libselinux-devel gettext ncurses-devel
 BuildRequires:  autoconf automake gettext-devel
@@ -65,6 +66,7 @@ Summary: Dpkg perl modules
 Group:   System Environment/Base
 Requires: %{name} = %{version}-%{release}
 Requires: perl, perl-TimeDate
+BuildArch: noarch
 
 %description perl
 This package provides the perl modules used by the scripts
@@ -97,6 +99,7 @@ dselect is a high-level interface for the installation/removal of debs .
 
 %prep
 %setup -q
+%patch0 -p1
 
 # Filter unwanted Requires:
 cat << \EOF > %{name}-req
@@ -302,8 +305,8 @@ rm -rf $RPM_BUILD_ROOT%{_sbindir}/install-info
 
 %files perl
 %defattr(-,root,root,-)
-%dir %{_libdir}/dpkg/parsechangelog
-%{_libdir}/dpkg/parsechangelog/*
+%dir %{_libexecdir}/dpkg/parsechangelog
+%{_libexecdir}/dpkg/parsechangelog/*
 
 #FIXME other imbarecing exclude why we should exclude this one ?
 #exclude %{perl_vendorlib}/Dpkg/Gettext.pm
@@ -363,6 +366,9 @@ rm -rf $RPM_BUILD_ROOT%{_sbindir}/install-info
 
 
 %changelog
+* Fri May 17 2013 Sérgio Basto <sergio at serjux.com> - 1.16.10-2
+- apply fix by Oron Peled bug #648384
+
 * Thu May 16 2013 Sérgio Basto <sergio at serjux.com> - 1.16.10-1
 - Add BR perl-podlators for pod2man in F19 development or just BR perl
 - Add some other importants BR: doxygen flex xz-devel po4a dotconf-devel
-- 
cgit v0.10.2


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