From fb8097ac6647aabf7f48436e1a854f3e33270384 Mon Sep 17 00:00:00 2001 From: Sérgio M. Basto Date: Sep 18 2018 01:50:07 +0000 Subject: Clean up --- diff --git a/debconf-1.5.49-python_version_support.patch b/debconf-1.5.49-python_version_support.patch deleted file mode 100644 index 48e97a3..0000000 --- a/debconf-1.5.49-python_version_support.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- ./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) --PYTHON_SITEDIR = $(prefix)/usr/lib/$(1)/$(if $(filter 2.0 2.1 2.2 2.3 2.4 2.5,$(patsubst python%,%,$(1))),site-packages,dist-packages) -+PYTHON_SITEDIR = $(shell python -c "from distutils.sysconfig import get_python_lib; import sys; sys.stdout.write(get_python_lib())") - - # Install all else. - 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)/$(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/; \ -- done -+ install -d $(prefix)$(PYTHON_SITEDIR) -+ install -m 0644 debconf.py $(prefix)$(PYTHON_SITEDIR) - install -d $(prefix)/usr/lib/python3/dist-packages - install -m 0644 debconf.py $(prefix)/usr/lib/python3/dist-packages/ - # Special case for back-compatability. diff --git a/debconf.spec b/debconf.spec index 89df30c..399645b 100644 --- a/debconf.spec +++ b/debconf.spec @@ -7,7 +7,6 @@ Group: Development/Tools License: BSD URL: https://tracker.debian.org/pkg/debconf Source0: http://ftp.de.debian.org/debian/pool/main/d/%{name}/%{name}_%{version}.tar.xz -Patch1: debconf-1.5.66-python_version_support.patch BuildArch: noarch #Build-Depends: debhelper (>= 9~), dh-exec, po-debconf, po4a (>= 0.23) @@ -91,14 +90,15 @@ Summary: python3 for debconf. %description -n python3-%{name} This package contains the python3 for debconf. + %prep %setup -q -n debconf -#patch1 -p1 %build %make_build + %install make install-utils prefix=%{buildroot} make install-i18n prefix=%{buildroot} @@ -227,7 +227,6 @@ done %{_datadir}/pixmaps/debian-logo.png %{_var}/cache/%{name} %exclude %{perl_vendorlib}/Debconf/Element/Gnome* -#exclude %{perl_vendorlib}/Debconf/Element/Kde* %exclude %{perl_vendorlib}/Debconf/FrontEnd/Gnome* %exclude %{perl_vendorlib}/Debconf/FrontEnd/Kde* @@ -238,7 +237,6 @@ done %files kde -#{perl_vendorlib}/Debconf/Element/Kde* %{perl_vendorlib}/Debconf/FrontEnd/Kde*