diff --git a/.gitignore b/.gitignore index e1572ec..a5405f4 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /debconf_1.5.59.tar.xz /debconf_1.5.60.tar.xz /debconf_1.5.63.tar.xz +/debconf_1.5.69.tar.xz diff --git a/debconf.spec b/debconf.spec index b45e9f0..89df30c 100644 --- a/debconf.spec +++ b/debconf.spec @@ -1,25 +1,30 @@ Name: debconf -Version: 1.5.63 -Release: 4%{?dist} +Version: 1.5.69 +Release: 1%{?dist} Summary: Debian configuration management system Group: Development/Tools License: BSD -URL: http://packages.debian.org/sid/debconf +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.49-python_version_support.patch +Patch1: debconf-1.5.66-python_version_support.patch BuildArch: noarch +#Build-Depends: debhelper (>= 9~), dh-exec, po-debconf, po4a (>= 0.23) +#Build-Depends-Indep: perl (>= 5.10.0-16), python (>= 2.6.6-3~), python3 (>= 3.1.2-8), gettext (>= 0.13), libintl-perl, libqtgui4-perl BuildRequires: python2-devel +BuildRequires: python%{python3_pkgversion}-devel BuildRequires: po4a >= 0.23 BuildRequires: gettext >= 0.13 BuildRequires: perl-generators +BuildRequires: perl-libintl-perl BuildRequires: perl-Qt-devel +BuildRequires: perl-Gtk3 # Not actual requirements, although listed at # http://ftp.de.debian.org/debian/pool/main/d/debconf/debconf_1.5.32.dsc -#BuildRequires: debhelper >= 7.0.50 -#BuildRequires: perl-libintl -#BuildRequires: po-debconf +BuildRequires: debhelper >= 7.0.50 +BuildRequires: po-debconf + Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) @@ -72,18 +77,41 @@ Requires: %{name} = %{version}-%{release} %description utils This package contains some small utilities for debconf developers. +%package -n python2-%{name} +Summary: python2 for debconf +%{?python_provide:%python_provide python2-%{name}} + +%description -n python2-%{name} +This package contains the python2 for debconf. + +%package -n python3-%{name} +Summary: python3 for debconf. +%{?python_provide:%python_provide python3-%{name}} + +%description -n python3-%{name} +This package contains the python3 for debconf. + %prep %setup -q -n debconf -%patch1 -p1 +#patch1 -p1 %build -make %{?_smp_mflags} +%make_build %install make install-utils prefix=%{buildroot} -make install-rest prefix=%{buildroot} make install-i18n prefix=%{buildroot} +#make install-python2 prefix=%{buildroot} +set -e; for dir in %{buildroot}%{python2_sitelib}; do \ + install -d $dir; \ + install -m 0644 debconf.py $dir/; \ +done +#make install-python3 prefix=%{buildroot} +install -d %{buildroot}%{python3_sitelib} +install -m 0644 debconf.py %{buildroot}%{python3_sitelib} + +make install-rest prefix=%{buildroot} # Add /var/cache/debconf and initial contents mkdir -p %{buildroot}/%{_var}/cache/%{name} @@ -172,7 +200,8 @@ done %files %doc doc/README doc/EXAMPLES doc/CREDITS doc/README.translators doc/README.LDAP doc/TODO -%doc debian/changelog debian/copyright debian/README.Debian +%doc debian/changelog debian/README.Debian +%license debian/copyright %config(noreplace) %{_sysconfdir}/debconf.conf %{_bindir}/debconf %{_bindir}/debconf-apt-progress @@ -183,8 +212,6 @@ done %{_bindir}/debconf-show %{_sbindir}/dpkg-preconfigure %{_sbindir}/dpkg-reconfigure -%{python2_sitelib}/debconf.* -%exclude /usr/lib/python3 %{perl_vendorlib}/Debconf %{perl_vendorlib}/Debian %{_datadir}/%{name} @@ -200,7 +227,7 @@ 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/Element/Kde* %exclude %{perl_vendorlib}/Debconf/FrontEnd/Gnome* %exclude %{perl_vendorlib}/Debconf/FrontEnd/Kde* @@ -211,7 +238,7 @@ done %files kde -%{perl_vendorlib}/Debconf/Element/Kde* +#{perl_vendorlib}/Debconf/Element/Kde* %{perl_vendorlib}/Debconf/FrontEnd/Kde* @@ -245,8 +272,18 @@ done %{_mandir}/man1/debconf-loadtemplate.1* %{_mandir}/man1/debconf-mergetemplate.1* +%files -n python2-%{name} +%{python2_sitelib} + +%files -n python3-%{name} +%{python3_sitelib} %changelog +* Mon Sep 17 2018 Sérgio Basto - 1.5.69-1 +- Update to 1.5.69 (#1504325) +- Provide Python2 and Python3 sub packages (#1531598) +- Fix FTBFS (#1603758) + * Thu Jul 12 2018 Fedora Release Engineering - 1.5.63-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index f3b2c05..827a250 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (debconf_1.5.63.tar.xz) = dac20034f234d6bf465da020ef5728f06047a9256eba6c8953c047d2afbbaf169120f4cc88758849f038a9cf770455e0f2da4cbc088fa0a35f0f25382d6f84de +SHA512 (debconf_1.5.69.tar.xz) = b09a8f41e591f5d0b4e9ae29a4e6a35dfb7b5599150dec862ef68c5bc0c0a0200c5e76cfc54786ad5bed3a7226f8ffb8e9c40158c1599e7021f90d187f959e24