diff --git a/debconf-1.5.49-python_version_support.patch b/debconf-1.5.49-python_version_support.patch index 028351a..48e97a3 100644 --- a/debconf-1.5.49-python_version_support.patch +++ b/debconf-1.5.49-python_version_support.patch @@ -1,8 +1,7 @@ -diff -up ./Makefile.old ./Makefile ---- ./Makefile.old 2013-04-03 04:54:30.830945272 +0300 -+++ ./Makefile 2013-04-03 05:04:43.305687227 +0300 -@@ -35,8 +35,7 @@ install-i18n: - $(MAKE) -C po install +--- ./Makefile.orig 2017-07-03 06:15:11.000000000 +0100 ++++ ./Makefile 2017-08-18 20:15:59.975264399 +0100 +@@ -38,8 +38,7 @@ PERL := perl + PERL_VENDORLIB := $(shell $(PERL) -MConfig -e 'print $$Config{vendorlib}') # This would probably be easier if we used setup.py ... -PYTHON2_SUPPORTED := $(shell pyversions -s) @@ -11,10 +10,10 @@ diff -up ./Makefile.old ./Makefile # Install all else. install-rest: -@@ -56,10 +55,8 @@ install-rest: +@@ -59,10 +58,8 @@ install-rest: # Install modules. find Debconf -type f -name '*.pm' |grep -v CVS | \ - xargs -i install -m 0644 {} $(prefix)/usr/share/perl5/{} + xargs -i install -m 0644 {} $(prefix)/$(PERL_VENDORLIB)/{} - set -e; for dir in $(foreach python,$(PYTHON2_SUPPORTED),$(call PYTHON_SITEDIR,$(python))); do \ - install -d $$dir; \ - install -m 0644 debconf.py $$dir/; \ diff --git a/debconf.spec b/debconf.spec index 2b2b80c..fb05604 100644 --- a/debconf.spec +++ b/debconf.spec @@ -1,6 +1,6 @@ Name: debconf -Version: 1.5.60 -Release: 5%{?dist} +Version: 1.5.63 +Release: 1%{?dist} Summary: Debian configuration management system Group: Development/Tools @@ -99,10 +99,10 @@ mkdir -p \ %{buildroot}/%{_mandir}/ru/man{1,3,5,7,8} \ %{buildroot}/%{_mandir}/pt_BR/man{1,3,8} -%if "%{_datadir}/perl5" != "%{perl_vendorlib}" -mv %{buildroot}/%{_datadir}/perl5/Debconf %{buildroot}/%{perl_vendorlib}/. -mv %{buildroot}/%{_datadir}/perl5/Debian %{buildroot}/%{perl_vendorlib}/. -%endif +#if "%{_datadir}/perl5" != "%{perl_vendorlib}" +#mv %{buildroot}/%{_datadir}/perl5/Debconf %{buildroot}/%{perl_vendorlib}/. +#mv %{buildroot}/%{_datadir}/perl5/Debian %{buildroot}/%{perl_vendorlib}/. +#endif chmod 755 %{buildroot}/%{_datadir}/%{name}/confmodule* @@ -247,6 +247,9 @@ done %changelog +* Fri Aug 18 2017 Sérgio Basto - 1.5.63-1 +- Update to 1.5.63 (#1453021) + * Wed Aug 16 2017 Iryna Shcherbina - 1.5.60-5 - Add a build-time dependency on python2-devel