From f176f8d870927a82cef5b89d04e61941b35a955e Mon Sep 17 00:00:00 2001 From: Sérgio M. Basto Date: Jun 06 2020 05:43:37 +0000 Subject: Merge branch 'master' into epel8 --- diff --git a/.gitignore b/.gitignore index 903e3bd..901d1df 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /debconf_1.5.63.tar.xz /debconf_1.5.69.tar.xz /debconf_1.5.73.tar.xz +/debconf_1.5.74.tar.xz diff --git a/debconf.spec b/debconf.spec index b0cdefb..a02d9e2 100644 --- a/debconf.spec +++ b/debconf.spec @@ -1,38 +1,56 @@ Name: debconf -Version: 1.5.73 -Release: 2%{?dist} +Version: 1.5.74 +Release: 4%{?dist} Summary: Debian configuration management system License: BSD URL: https://tracker.debian.org/pkg/debconf -Source0: http://ftp.de.debian.org/debian/pool/main/d/%{name}/%{name}_%{version}.tar.xz +Source0: https://ftp.de.debian.org/debian/pool/main/d/%{name}/%{name}_%{version}.tar.xz BuildArch: noarch -#Build-Depends: debhelper (>= 9~), dh-exec, po-debconf, po4a (>= 0.23) -#Build-Depends-Indep: perl (>= 5.10.0-16), python3 (>= 3.1.2-8), gettext (>= 0.13), libintl-perl, libqtgui4-perl +#Build-Depends: debhelper-compat (= 12), dh-exec, dh-python, po-debconf, po4a (>= 0.23) +#Build-Depends-Indep: perl (>= 5.10.0-16), python3 (>= 3.1.2-8), gettext (>= 0.13), libintl-perl BuildRequires: python%{python3_pkgversion}-devel BuildRequires: po4a >= 0.23 BuildRequires: gettext >= 0.13 BuildRequires: perl-generators BuildRequires: perl-interpreter -BuildRequires: perl-libintl-perl -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: po-debconf Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +# Required in Debconf/Encoding.pm # to test frontends : dpkg-reconfigure --frontend=kde tzdata -Requires: perl-Text-Iconv +%if 0%{?rhel} > 7 +Recommends: perl(Text::Iconv) +%else +Requires: perl(Text::Iconv) +%endif +Requires: perl(Text::WrapI18N) +Requires: perl(Text::CharWidth) +# Required in Debconf/Gettext.pm +Requires: perl(Locale::gettext) + Obsoletes: debconf-kde < 1.5.69-5 -Obsoletes: debconf-gnome < 1.5.69-5 %description Debconf is a configuration management system for Debian packages. Packages use Debconf to ask questions when they are installed. +%package gnome +Summary: GNOME frontend for debconf +Requires: %{name} = %{version}-%{release} + +%description gnome +This package contains the GNOME frontend for debconf. + +%package LDAP +Summary: Experimental LDAP driver for debconf +Requires: %{name} = %{version}-%{release} + +%description LDAP +This package contains an experimental database driver to provide LDAP support +for debconf + %package doc Summary: Debconf documentation Requires: %{name} = %{version}-%{release} @@ -193,16 +211,24 @@ done %{_mandir}/man8/dpkg-reconfigure.8* %{_datadir}/pixmaps/debian-logo.png %{_var}/cache/%{name} +%exclude %{perl_vendorlib}/Debconf/Element/Gnome* +%exclude %{perl_vendorlib}/Debconf/FrontEnd/Gnome* +%exclude %{perl_vendorlib}/Debconf/DbDriver/LDAP.pm + + +%files LDAP +%doc doc/README.LDAP +%{perl_vendorlib}/Debconf/DbDriver/LDAP.pm + + +%files gnome %{perl_vendorlib}/Debconf/Element/Gnome* %{perl_vendorlib}/Debconf/FrontEnd/Gnome* -%{perl_vendorlib}/Debconf/FrontEnd/Kde* %files doc -f man-doc.lang %doc samples/ -%doc doc/CREDITS doc/README doc/README.LDAP doc/TODO -%doc debian/changelog -%doc debian/copyright +%license debian/copyright %doc doc/debconf.schema %doc doc/hierarchy.txt %doc doc/namespace.txt @@ -233,6 +259,23 @@ done %{python3_sitelib}/__pycache__/debconf.* %changelog +* Sat Jun 06 2020 Sérgio Basto - 1.5.74-4 +- Add sub-package LDAP driver to avoid the big number of dependencies of + perl-LDAP +- Drop BRs perl-libintl-perl, debhelper and po-debconf + +* Wed Jun 03 2020 Sérgio Basto - 1.5.74-3 +- Re-add sub-package gnome to avoid the big number of dependencies of perl-GTK3 + +* Tue May 26 2020 Miro Hrončok - 1.5.74-2 +- Rebuilt for Python 3.9 + +* Tue May 19 2020 Sérgio Basto - 1.5.74-1 +- Update to 1.5.74 + +* Tue Jan 28 2020 Fedora Release Engineering - 1.5.73-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Sat Jan 11 2020 Sérgio Basto - 1.5.73-2 - Fix typo on commit 77cbe078 diff --git a/sources b/sources index 96ab1c9..305d80d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (debconf_1.5.73.tar.xz) = fa2e240842f4f020df031ef37803c22a680372b996302372dfd3377bf21723f2e949167f9ea13ebad5c1c516052c26adcd627d152a62110ccddd3a9e2b892bdc +SHA512 (debconf_1.5.74.tar.xz) = 421577c9fb0dae1c851c6676e7b0b3e59e5800d1ab01a9817e4506ee2f7cb812065e1a64b194b1192023951f1f0cabf0359e4dae4320b9cf0705865085cdc5cd