Browse Source

rpm-4.16.1.2-1 and requirements

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@12545 ec354946-7b23-47d6-9f5a-488ba84defc7
tomop 1 year ago
parent
commit
5e50597604

+ 26 - 12
c/chkconfig/chkconfig-vl.spec

@@ -2,8 +2,8 @@ Summary: A system tool for maintaining the /etc/rc*.d hierarchy.
 Summary(ja): /etc/rc.d の階層をメンテナンスするためのシステムツール
 Name: chkconfig
 Version: 1.3.61
-Release: 3%{?_dist_release}
-Group: System Environment/Base
+Release: 4%{?_dist_release}
+Group: system,admin-tools
 Vendor: Project Vine
 Distribution: Vine Linux
 
@@ -30,10 +30,11 @@ runlevel の情報をアップデートや検証する。chkconfig は /etc/rc.d
 多数のシンボリックリンクを操作しますので、システム管理者は手動で
 シンボリックリンクをたびたびエディットしなくてもよい。
 
+
 %package -n ntsysv
 Summary: A tool to set the stop/start of system services in a runlevel.
 Summary(ja): /etc/rc.d 階階層をメンテナンスするシステムツール
-Group: System Environment/Base
+Group: system,admin-tools
 
 %description -n ntsysv
 Ntsysv provides a simple interface for setting which system services
@@ -47,10 +48,11 @@ ntsysv はシステムサービスの runlevel の情報をアップデートや
 ntsysv は システム管理者が直接/etc/rc.d の多数のシンボリックリンクを
 操作することから解放する。
 
+
 %package -n alternatives
 Summary: maintain symbolic links determining default commands (from Debian dpkg utilities)
 Summary(ja): コマンドのシンボリックリンクを管理する (Debian dpkg ユーティリティーより)
-Group: System Environment/Base
+Group: system,admin-tools
 
 %description -n alternatives
 maintain symbolic links determining default commands (from Debian dpkg utilities)
@@ -59,16 +61,15 @@ maintain symbolic links determining default commands (from Debian dpkg utilities
 コマンドのシンボリックリンクを管理する (Debian dpkg ユーティリティーより)
 
 
+%debug_package
+
+
 %prep
 %setup -q
-%patch1 -p1
-
-%build
+#%patch1 -p1
 
-%ifarch sparc
-LIBMHACK=-lm
-%endif
 
+%build
 %__make %{?_smp_mflags} RPM_OPT_FLAGS="$RPM_OPT_FLAGS" LIBMHACK=$LIBMHACK
 
 %install
@@ -88,7 +89,7 @@ cp %SOURCE2 %SOURCE3 $RPM_BUILD_ROOT%{_mandir}/ja/man8
 # alternatives
 mv -f $RPM_BUILD_ROOT/%{_sbindir}/*alternatives $RPM_BUILD_ROOT/%{_syssbindir}
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/alternatives
-mkdir -p $RPM_BUILD_ROOT/var/lib/rpm/alternatives
+mkdir -p $RPM_BUILD_ROOT/var/lib/alternatives
 install -m644 %{SOURCE4} $RPM_BUILD_ROOT%{_mandir}/ja/man8/alternatives.8
 ln -sf alternatives.8.gz $RPM_BUILD_ROOT%{_mandir}/ja/man8/update-alternatives.8.gz
 
@@ -99,9 +100,19 @@ do
   ln -sf /sbin/$i $RPM_BUILD_ROOT/%{_sbindir}/$i
 done
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
+%post -n alternatives
+if [ "$1" -gt "1" ]; then
+  if [ -d /var/lib/rpm/alternatives -a $(ls /var/lib/rpm/alternatives | wc --lines) -gt 0 ]; then
+    mv -f /var/lib/rpm/alternatives/* /var/lib/alternatives/
+  fi
+fi
+
+
 %files
 %defattr(-,root,root)
 /sbin/chkconfig
@@ -129,10 +140,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/alternatives
 %{_mandir}/man8/*
 %{_mandir}/ja/man8/*
-/var/lib/rpm/alternatives
+/var/lib/alternatives
 
 
 %changelog
+* Tue Feb 23 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.3.61-4
+- moved /var/lib/rpm/alternatives to /var/lib/alternatives.
+
 * Wed Mar 18 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.3.61-3
 - rebuilt with current environment.
 

+ 9 - 7
c/createrepo_c/createrepo_c-vl.spec

@@ -9,7 +9,7 @@
 
 Summary:        Creates a common metadata repository
 Name:           createrepo_c
-Version:        0.16.0
+Version:        0.17.0
 Release:        1%{?_dist_release}
 Group:          admin-tools
 Vendor:         Project Vine
@@ -30,19 +30,15 @@ BuildRequires:  curl-devel
 BuildRequires:  libxml2-devel
 BuildRequires:  openssl-devel
 BuildRequires:  rpm-devel >= 4.8.0-28
-BuildRequires:  sqlite-devel
+BuildRequires:  sqlite3-devel
 BuildRequires:  xz-devel
 BuildRequires:  zlib-devel
 Requires:       %{name}-libs =  %{version}-%{release}
-%if 0%{?rhel} == 6
-Requires: rpm >= 4.8.0-28
-%else
 BuildRequires:  bash-completion
-Requires: rpm >= 4.9.0
-%endif
 %if %{with drpm}
 BuildRequires:  drpm-devel >= 0.1.3
 %endif
+Requires: rpm >= 4.16.0
 
 %description
 C implementation of Createrepo.
@@ -86,6 +82,9 @@ Python 3 bindings for the createrepo_c library.
 %endif
 
 
+%debug_package
+
+
 %prep
 %setup -q
 mkdir build
@@ -166,6 +165,9 @@ popd
 
 
 %changelog
+* Mon Feb 22 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 0.17.0-1
+- new upstream release.
+
 * Mon Aug 17 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 0.16.0-1
 - new upstream release.
 

+ 6 - 1
g/grub2/grub2-vl.spec

@@ -13,7 +13,7 @@
 
 Name:           grub2
 Version:        2.04
-Release:        4%{?_dist_release}%{?with_systemd:.systemd}
+Release:        5%{?_dist_release}%{?with_systemd:.systemd}
 Summary:        Bootloader with support for Linux, Multiboot and more
 Group:          system
 License:        GPLv3+
@@ -616,7 +616,12 @@ fi
 
 
 %changelog
+* Mon Feb 22 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 2.04-5
+- rebuilt with rpm-4.16.
+
 * Wed Sep 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 2.04-4
+- rebuilt with current environment.
+
 * Tue Jul 28 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 2.04-3
 - imported Patch206-222 from rawhide.
 - updated ja.po.

+ 12 - 6
lib/liba/libappstream-glib/libappstream-glib-vl.spec

@@ -10,8 +10,8 @@
 Summary:	Library for AppStream metadata
 Summary(ja):	AppStream メタデータ用ライブラリ
 Name:		libappstream-glib
-Version:	0.7.17
-Release:	2%{?_dist_release}
+Version:	0.7.18
+Release:	1%{?_dist_release}
 Group:		admin-tools,system
 Vendor:		Project Vine
 Distribution:	Vine Linux
@@ -96,6 +96,9 @@ Requires:		%{name} = %{version}-%{release}
 %{summary}
 
 
+%debug_package
+
+
 %prep
 %autosetup -p1 -n appstream-glib-%{version}
 
@@ -173,22 +176,25 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Feb 22 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.7.18-1
+- new upstream release.
+
 * Sun Aug 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.7.17-2
 - added R:gsettins-desktop-schemas.
 
 * Sat Aug 01 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.7.17-1
-- new usptream release.
+- new upstream release.
 
 * Mon Sep 23 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.7.15-1
-- new usptream release.
+- new upstream release.
 - dropped Patch0.
 - drop a subpackage "libappstream-builder-devel": vanished in upstream.
 
 * Tue Dec 11 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.7.14-1
-- new usptream release.
+- new upstream release.
 
 * Thu Oct 29 2015 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.5.2-1
-- new usptream release
+- new upstream release
 - add BuildRequires: gcab-devel
 
 * Sun Oct 26 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.3.1-1

+ 5 - 1
n/net-snmp/net-snmp-vl.spec

@@ -9,7 +9,7 @@ Summary: A collection of SNMP protocol tools and libraries.
 Summary(ja): SNMP プロトコルツールとライブラリのコレクション
 Name: net-snmp
 Version: 5.9
-Release: 1%{?_dist_release}%{?with_systemd:.systemd}
+Release: 2%{?_dist_release}%{?with_systemd:.systemd}
 Group: servers,admin-tools
 Vendor: Project Vine
 Distribution: Vine Linux
@@ -227,6 +227,7 @@ the remote agents interactively.
 Install the net-snmp-gui package, if you want to use this interactive utility.
 %endif
 
+
 %debug_package
 
 
@@ -560,6 +561,9 @@ rm -rf ${RPM_BUILD_ROOT}
 
 
 %changelog
+* Mon Feb 22 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 5.9-2
+- rebuilt with rpm-4.16.
+
 * Tue Sep 08 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 5.9-1
 - new upstream release.
 - re-imported all patches from rawhide.

+ 135 - 0
p/perl-Fedora-VSP/perl-Fedora-VSP-vl.spec

@@ -0,0 +1,135 @@
+Name:           perl-Fedora-VSP
+Summary:        Perl version normalization for RPM
+Version:        0.001
+Release:        22%{?_dist_release}
+Group:          programming
+License:        GPLv3+
+URL:            https://ppisar.fedorapeople.org/Fedora-VSP/
+Source0:        %{url}Fedora-VSP-%{version}.tar.gz
+
+BuildArch:      noarch
+BuildRequires:  findutils
+BuildRequires:  make
+BuildRequires:  perl
+%if %{defined perl_bootstrap}
+#BuildRequires:  perl-macros
+%else
+# Break build cycle: perl-Fedora-VSP → perl-generators → perl-Fedora-VSP
+BuildRequires:  perl-generators
+%endif
+BuildRequires:  perl(ExtUtils::MakeMaker)
+# Run-time:
+BuildRequires:  perl(strict)
+BuildRequires:  perl(warnings)
+# Tests:
+BuildRequires:  perl(Test::More)
+BuildRequires:  perl(version)
+Requires:       perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
+%if %{defined perl_bootstrap}
+# Break build cycle: perl-Fedora-VSP → perl-generators → perl-Fedora-VSP
+Requires:       perl(strict)
+Requires:       perl(warnings)
+Provides:       perl(Fedora::VSP) = %{version}
+%global perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installv
+endorlib)
+%endif
+
+%description
+This module provides functions for normalizing Perl version strings for
+Red Hat Package (RPM) based Linux distributions.
+
+
+%prep
+%setup -q -n Fedora-VSP-%{version}
+
+
+%build
+perl Makefile.PL INSTALLDIRS=vendor
+make %{?_smp_mflags}
+
+
+%install
+make pure_install DESTDIR=%{buildroot}
+find %{buildroot} -type f -name .packlist -delete
+%{_fixperms} %{buildroot}/*
+
+
+%if !%{defined perl_bootstrap}
+%check
+make test
+%endif
+
+
+%files
+%license COPYING
+%{perl_vendorlib}/*
+%{_mandir}/man3/*
+
+
+%changelog
+* Mon Feb 22 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 0.001-22
+- initial build for Vine Linux.
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.001-21
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.001-20
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Fri Jun 26 2020 Jitka Plesnikova <jplesnik@redhat.com> - 0.001-19
+- Perl 5.32 re-rebuild of bootstrapped packages
+
+* Mon Jun 22 2020 Jitka Plesnikova <jplesnik@redhat.com> - 0.001-18
+- Perl 5.32 rebuild
+
+* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.001-17
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.001-16
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Sun Jun 02 2019 Jitka Plesnikova <jplesnik@redhat.com> - 0.001-15
+- Perl 5.30 re-rebuild of bootstrapped packages
+
+* Thu May 30 2019 Jitka Plesnikova <jplesnik@redhat.com> - 0.001-14
+- Perl 5.30 rebuild
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.001-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.001-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Sat Jun 30 2018 Jitka Plesnikova <jplesnik@redhat.com> - 0.001-11
+- Perl 5.28 re-rebuild of bootstrapped packages
+
+* Tue Jun 26 2018 Jitka Plesnikova <jplesnik@redhat.com> - 0.001-10
+- Perl 5.28 rebuild
+
+* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.001-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.001-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Wed Jun 07 2017 Jitka Plesnikova <jplesnik@redhat.com> - 0.001-7
+- Perl 5.26 re-rebuild of bootstrapped packages
+
+* Sat Jun 03 2017 Jitka Plesnikova <jplesnik@redhat.com> - 0.001-6
+- Perl 5.26 rebuild
+
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.001-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Mon May 30 2016 Petr Pisar <ppisar@redhat.com> - 0.001-4
+- Break build cycle when bootstrapping: perl-Fedora-VSP → perl-generators
+  → perl-Fedora-VSP
+
+* Sat May 14 2016 Jitka Plesnikova <jplesnik@redhat.com> - 0.001-3
+- Perl 5.24 rebuild
+
+* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.001-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Fri Oct 09 2015 Petr Pisar <ppisar@redhat.com> 0.001-1
+- First package

+ 212 - 0
p/perl-generators/perl-generators-vl.spec

@@ -0,0 +1,212 @@
+Name:           perl-generators
+Summary:        RPM Perl dependencies generators
+Version:        1.12
+Release:        2%{?_dist_release}
+Group:          programming
+Vendor:         Project Vine
+Distribution:   Vine Linux
+
+License:        GPL+
+URL:            http://jplesnik.fedorapeople.org/generators
+Source0:        %{url}/generators-%{version}.tar.gz
+Source1:        https://src.fedoraproject.org/rpms/perl/blob/rawhide/f/macros.perl
+
+BuildArch:      noarch
+BuildRequires:  coreutils
+BuildRequires:  make
+%if !%{defined perl_bootstrap}
+# Break build cycle: reflexive dependency
+BuildRequires:  perl-generators
+%endif
+BuildRequires:  perl
+BuildRequires:  perl(ExtUtils::MakeMaker)
+BuildRequires:  perl(File::Copy)
+BuildRequires:  perl(File::Find)
+BuildRequires:  perl(strict)
+BuildRequires:  perl(warnings)
+BuildRequires:  sed
+# Run-time:
+BuildRequires:  perl(Fedora::VSP)
+BuildRequires:  perl(File::Basename)
+# Optional run-time:
+# version not used at tests
+# Tests:
+BuildRequires:  perl(lib)
+BuildRequires:  perl(Exporter)
+BuildRequires:  perl(Test::More)
+BuildRequires:  perl(Test::Simple)
+Requires:       perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
+Requires:       perl
+%if %{defined perl_bootstrap}
+# Supply run-time dependencies manually when perl-generators is not available
+Requires:       perl(Fedora::VSP)
+Requires:       perl(File::Basename)
+%endif
+Recommends:     perl(version)
+
+# The generators and attribute files were split from rpm-build
+Conflicts:      rpm-build < 4.11.2-15
+
+%description
+This package provides RPM Perl dependencies generators which are used for
+getting provides and requires from Perl binaries and modules.
+
+%prep
+%setup -q -n generators-%{version}
+
+%build
+perl Makefile.PL INSTALLDIRS=vendor INSTALLVENDORSCRIPT=%{_rpmconfigdir} \
+     NO_PACKLIST=1 NO_PERLLOCAL=1
+%{make_build}
+
+%install
+%{make_install}
+%{_fixperms} $RPM_BUILD_ROOT/*
+
+mkdir -p %{buildroot}%{_rpmconfigdir}/fileattrs/
+install -p -m 644 fileattrs/* '%{buildroot}%{_rpmconfigdir}/fileattrs'
+
+mkdir -p %{buildroot}%{_rpmmacrodir}
+install -p -m 644 %{SOURCE1} %{buildroot}%{_rpmmacrodir}/macros.perl
+
+
+%check
+make test
+
+
+%files
+%doc Changes TODO
+%{_rpmconfigdir}/perl*
+%{_rpmconfigdir}/fileattrs/perl*.attr
+%{_rpmmacrodir}/macros.perl
+
+
+%changelog
+* Mon Feb 22 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.12-2
+- initial build for Vine Linux.
+
+* Wed Feb 10 2021 Jitka Plesnikova <jplesnik@redhat.com> - 1.12-1
+- 1.12 bump
+  Add perltest.attr to generate dependencies from /usr/libexec/
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.11-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Thu Jul 30 2020 Petr Pisar <ppisar@redhat.com> - 1.11-9
+- Specify all dependencies
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.11-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Fri Jun 26 2020 Jitka Plesnikova <jplesnik@redhat.com> - 1.11-7
+- Perl 5.32 re-rebuild of bootstrapped packages
+
+* Mon Jun 22 2020 Jitka Plesnikova <jplesnik@redhat.com> - 1.11-6
+- Perl 5.32 rebuild
+
+* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.11-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.11-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Sun Jun 02 2019 Jitka Plesnikova <jplesnik@redhat.com> - 1.11-3
+- Perl 5.30 re-rebuild of bootstrapped packages
+
+* Thu May 30 2019 Jitka Plesnikova <jplesnik@redhat.com> - 1.11-2
+- Perl 5.30 rebuild
+
+* Thu May 23 2019 Jitka Plesnikova <jplesnik@redhat.com> - 1.11-1
+- 1.11 bump
+
+* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.10-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.10-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Sat Jun 30 2018 Jitka Plesnikova <jplesnik@redhat.com> - 1.10-9
+- Perl 5.28 re-rebuild of bootstrapped packages
+
+* Tue Jun 26 2018 Jitka Plesnikova <jplesnik@redhat.com> - 1.10-8
+- Perl 5.28 rebuild
+
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.10-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.10-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Thu Jul 13 2017 Petr Pisar <ppisar@redhat.com> - 1.10-5
+- perl dependency renamed to perl-interpreter
+  <https://fedoraproject.org/wiki/Changes/perl_Package_to_Install_Core_Modules>
+
+* Wed Jun 07 2017 Jitka Plesnikova <jplesnik@redhat.com> - 1.10-4
+- Perl 5.26 re-rebuild of bootstrapped packages
+
+* Sat Jun 03 2017 Jitka Plesnikova <jplesnik@redhat.com> - 1.10-3
+- Perl 5.26 rebuild
+
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.10-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Tue Jul 12 2016 Jitka Plesnikova <jplesnik@redhat.com> - 1.10-1
+- 1.10 bump
+
+* Thu Jun 23 2016 Jitka Plesnikova <jplesnik@redhat.com> - 1.09-1
+- 1.09 bump
+
+* Wed Jun 15 2016 Petr Pisar <ppisar@redhat.com> - 1.08-4
+- Run-require perl-macros to provide the Perl macros for building Perl packages
+
+* Wed Jun 01 2016 Petr Pisar <ppisar@redhat.com> - 1.08-3
+- Supply run-time depenencies manually when perl-generators is not available on
+  bootstrap
+
+* Sat May 14 2016 Jitka Plesnikova <jplesnik@redhat.com> - 1.08-2
+- Perl 5.24 rebuild
+
+* Mon Mar 21 2016 Jitka Plesnikova <jplesnik@redhat.com> - 1.08-1
+- 1.08 bump; Resolves BZ#1318658
+
+* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.07-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Tue Oct 20 2015 Jitka Plesnikova <jplesnik@redhat.com> - 1.07-2
+- Add epoch to perl BR
+
+* Tue Oct 20 2015 Jitka Plesnikova <jplesnik@redhat.com> - 1.07-1
+- 1.07 bump
+- Return perl version as normalized perl(:VERSION) symbol
+
+* Tue Oct 06 2015 Jitka Plesnikova <jplesnik@redhat.com> - 1.06-1
+- 1.06 bump
+
+* Tue Sep 29 2015 Jitka Plesnikova <jplesnik@redhat.com> - 1.05-1
+- 1.05 bump
+- Resolves: bug #1267267
+
+* Wed Jul 29 2015 Jitka Plesnikova <jplesnik@redhat.com> - 1.04-1
+- 1.04 bump
+
+* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.03-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Wed Jun 03 2015 Jitka Plesnikova <jplesnik@redhat.com> - 1.03-2
+- Perl 5.22 rebuild
+
+* Mon Feb 02 2015 Jitka Plesnikova <jplesnik@redhat.com> - 1.03-1
+- 1.03 bump
+- Update parcing of here-doc and quoted section
+
+* Fri Dec 12 2014 Jitka Plesnikova <jplesnik@redhat.com> - 1.02-1
+- 1.02 bump
+
+* Tue Oct 21 2014 Jitka Plesnikova <jplesnik@redhat.com> - 1.01-1
+- 1.01 bump
+
+* Tue Aug 26 2014 Jitka Plesnikova <jplesnik@redhat.com> - 1.00-2
+- Perl 5.20 rebuild
+
+* Mon Jun 16 2014 Jitka Plesnikova <jplesnik@redhat.com> - 1.00-1
+- Introduce Perl generators as a standalone package

+ 28 - 42
p/perl/perl-vl.spec

@@ -11,11 +11,23 @@
 %endif
 
 %define perl_version 5.26.2
-%define perlrel 3
+%define perlrel 4
 %define perl_epoch 2
 
-Provides: perl(:WITH_PERLIO)
+%global perl_archname %{_arch}-%{_os}%{thread_arch}
+
+%global new_perl_lib  %{buildroot}%{_libdir}/perl5/%{version}:%{buildroot}%{_prefix}/lib/perl5/%{version}
+%global comp_perl_lib %{buildroot}%{_prefix}/lib/perl5/%{version}:%{buildroot}%{_prefix}/lib/perl5/%{version}
+%global new_arch_lib  %{buildroot}%{_libdir}/perl5/%{version}/%{perl_archname}
+%global comp_arch_lib %{buildroot}%{_prefix}/lib/perl5/%{version}/%{perl_archname}
+%global new_perl_flags LD_PRELOAD=/%{new_arch_lib}/CORE/libperl.so LD_LIBRARY_PATH=%{new_arch_lib}/CORE PERL5LIB=%{new_perl_lib}:%{comp_perl_lib}
+%global new_perl %{new_perl_flags} %{buildroot}/%{_bindir}/perl
 
+# Interpreter version to fulfil required genersted from "require 5.006;"
+Provides:       perl(:VERSION) = %{perl_version}
+# Integeres are 64-bit on all platforms
+Provides:       perl(:WITH_64BIT)
+# Threading provides
 %if %{threading}
 %define thread_arch -thread-multi%{arch_suffix}
 Provides: perl(:WITH_ITHREADS)
@@ -25,30 +37,22 @@ Provides: perl(:WITH_THREADS)
 Provides: perl(:WITHOUT_ITHREADS)
 Provides: perl(:WITHOUT_THREADS)
 %endif
-
-%global perl_archname %{_arch}-%{_os}%{thread_arch}
-
-%global new_perl_lib  %{buildroot}%{_libdir}/perl5/%{version}:%{buildroot}%{_prefix}/lib/perl5/%{version}
-%global comp_perl_lib %{buildroot}%{_prefix}/lib/perl5/%{version}:%{buildroot}%{_prefix}/lib/perl5/%{version}
-%global new_arch_lib  %{buildroot}%{_libdir}/perl5/%{version}/%{perl_archname}
-%global comp_arch_lib %{buildroot}%{_prefix}/lib/perl5/%{version}/%{perl_archname}
-%global new_perl_flags LD_PRELOAD=/%{new_arch_lib}/CORE/libperl.so LD_LIBRARY_PATH=%{new_arch_lib}/CORE PERL5LIB=%{new_perl_lib}:%{comp_perl_lib}
-%global new_perl %{new_perl_flags} %{buildroot}/%{_bindir}/perl
-
+# Largefile provides
 %if %{largefiles}
 Provides: perl(:WITH_LARGEFILES)
 %else
 Provides: perl(:WITHOUT_LARGEFILES)
 %endif
+# PerlIO provides
+Provides: perl(:WITH_PERLIO)
 
 Summary:      The Perl programming language.
 Summary(ja):  Perl プログラミング 言語
-
 Name:         perl
 Epoch:        %{perl_epoch}
 Version:      %{perl_version}
 Release:      %{perlrel}%{?_dist_release}
-Group:        Development/Languages
+Group:        programming
 Vendor:       Project Vine
 Distribution: Vine Linux
 
@@ -59,10 +63,6 @@ Source10:     system-owned-directories
 Source11:     filter-depends.sh
 Source12:     perl-5.8.0-libnet.cfg
 
-%if %{_dist_release} < "vl7"
-%global __perl_requires %{SOURCE11}
-%endif
-
 Conflicts: perl-NDBM_File <= 1:1.75-34.99.6
 
 Obsoletes: perl-Digest-MD5
@@ -302,6 +302,9 @@ Patch201:       perl-5.16.3-Link-XS-modules-to-libperl.so-with-EU-MM-on-Linux.pa
 # patch from openSUSE
 Patch1000:      perl-fix2020.patch
 
+# patch from upstream
+Patch1010:      perl-5.26-gcc10.patch
+
 # Vine
 # (nothing)
 
@@ -417,7 +420,7 @@ Perl で書かれています.
 
 %package localdirs
 Summary:      Perl library directories in /usr/local
-Group:        Development/Languages
+Group:        programming
 License:      Artistic or GPL
 Requires:     perl = %{perl_epoch}:%{perl_version}-%{release}
 Obsoletes:    perl < 5.10.0
@@ -496,6 +499,9 @@ Perl library directories in /usr/local
 ## patch from openSUSE
 %patch1000 -p1
 
+## patch from upstream
+%patch1010 -p1
+
 ## security patch(es)
 %patch20000 -p1
 %patch20001 -p1
@@ -527,7 +533,6 @@ find . -name \*.orig -exec rm -fv {} \;
 
 # Oh, the irony. Perl generates some non-versioned provides we don't need.
 # Each of these has a versioned provide, which we keep.
-%if %{_dist_release} > "vl6"
 %global __provides_exclude %{?__provides_exclude:__provides_exclude|}^perl\\(Carp\\)$
 %global __provides_exclude %__provides_exclude|^perl\\(DynaLoader\\)$
 %global __provides_exclude %__provides_exclude|^perl\\(Locale::Maketext\\)$
@@ -552,27 +557,6 @@ find . -name \*.orig -exec rm -fv {} \;
 %global __requires_exclude %__requires_exclude|^perl\\(Locale::Codes\\)
 %global __requires_exclude %__requires_exclude|^perl\\(Locale::Codes::
 echo "__requires_exclude: %__requires_exclude"
-%else
-cat << EOF > perl-prov
-#!/bin/sh
-/usr/lib/rpm/perl.prov $* |\
-    sed -e '/^perl(Carp)$/d' |\
-    sed -e '/^perl(DynaLoader)$/d' |\
-    sed -e '/^perl(Locale::Maketext)$/d' |\
-    sed -e '/^perl(Log::Message::Handlers)$/d' |\
-    sed -e '/^perl(Math::BigInt)$/d' |\
-    sed -e '/^perl(Net::Config)$/d' |\
-    sed -e '/^perl(Tie::Hash)$/d' |\
-    sed -e '/^perl(bigint)$/d' |\
-    sed -e '/^perl(bigrat)$/d' |\
-    sed -e '/^perl(bytes)$/d' |\
-    sed -e '/^perl(utf8)$/d' |\
-    sed -e '/^perl(DB)$/d'
-
-EOF
-%define __perl_provides %{_builddir}/%{name}-%{perl_version}/perl-prov
-chmod +x %{__perl_provides}
-%endif
 
 # Configure Compress::Zlib to use system zlib
 sed -i 's|BUILD_ZLIB      = True|BUILD_ZLIB      = False|
@@ -790,7 +774,6 @@ LC_ALL=C make test
 
 
 %post -p /sbin/ldconfig
-
 %postun -p /sbin/ldconfig
 
 
@@ -815,6 +798,9 @@ LC_ALL=C make test
 
 
 %changelog
+* Mon Feb 22 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 5.26.2-4
+- rebuilt with current environment.
+
 * Wed Jun 10 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 5.26.2-3
 - added Patch20004-20006 to fix CVE-2020-{10543,10878,12723}.
 

+ 4 - 1
p/pyparsing/pyparsing-vl.spec

@@ -1,6 +1,6 @@
 Name:           pyparsing
 Version:        2.4.7
-Release:        1%{?_dist_release}
+Release:        2%{?_dist_release}
 Summary:        An object-oriented approach to text processing
 Summary(ja):	オブジェクト指向のテキストパース用 Python モジュール
 Group:          programming
@@ -106,6 +106,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Feb 23 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.4.7-2
+- rebuilt with rpm-4.16.
+
 * Sun Aug 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.4.7-1
 - new upstream release.
 

+ 4 - 1
p/python-chardet/python-chardet-vl.spec

@@ -2,7 +2,7 @@
 
 Name:           python-chardet
 Version:        3.0.4
-Release:        2%{?_dist_release}
+Release:        3%{?_dist_release}
 Summary:        Character encoding auto-detection in Python
 Summary(ja):    Python で文字エンコーディングを自動検出
 Group:          programming
@@ -73,6 +73,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Feb 23 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.0.4-3
+- rebuilt with rpm-4.16.
+
 * Sat Aug 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.0.4-2
 - rebuilt with python-3.8.
 

+ 4 - 1
p/python-idna/python-idna-vl.spec

@@ -3,7 +3,7 @@
 
 Name:           python-%{srcname}
 Version:        2.10
-Release:        1%{?_dist_release}
+Release:        2%{?_dist_release}
 Summary:        Internationalized Domain Names in Applications (IDNA)
 Group:          programming
 Vendor:         Project Vine
@@ -99,6 +99,9 @@ rm -rf %{srcname}.egg-info
 
 
 %changelog
+* Tue Feb 23 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 2.10-2
+- rebuilt with rpm-4.16.
+
 * Sat Aug 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 2.10-1
 - new upstream release.
 

+ 12 - 3
p/python-packaging/python-packaging-vl.spec

@@ -6,7 +6,7 @@
 
 Summary:        Core utilities for Python packages
 Name:           python-%{pypi_name}
-Version:        20.4
+Version:        20.9
 Release:        1%{?_dist_release}
 Group:          programming
 Vendor:         Project Vine
@@ -63,31 +63,36 @@ python3-packaging provides core utilities for Python packages like utilities for
 dealing with versions, specifiers, markers etc.
 %endif
 
+
 %prep
 %autosetup -n %{pypi_name}-%{version}
 # Remove bundled egg-info
 rm -rf %{pypi_name}.egg-info
 
+
 %build
-%py2_build
+%py_build
 
 %if 0%{?with_python3}
 %py3_build
 %endif
 
+
 %install
-%py2_install
+%py_install
 
 %if 0%{?with_python3}
 %py3_install
 %endif
 
+
 %check
 %if %{with test}
 %{__python2} -m pytest tests/
 %{__python3} -m pytest tests/
 %endif
 
+
 %files
 %license LICENSE LICENSE.APACHE LICENSE.BSD
 %doc README.rst CHANGELOG.rst CONTRIBUTING.rst
@@ -102,7 +107,11 @@ rm -rf %{pypi_name}.egg-info
 %{python3_sitelib}/%{pypi_name}-*-info/
 %endif
 
+
 %changelog
+* Tue Feb 23 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 20.9-1
+- new upstream release.
+
 * Sun Aug 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 20.4-1
 - new upstream release.
 

+ 4 - 1
p/python-pip/python-pip-vl.spec

@@ -17,7 +17,7 @@
 Summary:        Pip installs Python packages.  An easy_install replacement
 Summary(ja):    Pip は easy_install を置き換える Python パッケージインストーラです。
 Name:           python-%{srcname}
-Version:        20.2.2
+Version:        20.3.4
 Release:        1%{?_dist_release}
 Group:          programming
 Vendor:         Project Vine
@@ -188,6 +188,9 @@ fi
 
 
 %changelog
+* Tue Feb 23 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 20.3.4-1
+- new upstream release.
+
 * Sat Aug 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 20.2.2-1
 - new upstream release.
 

+ 157 - 0
p/python-progressbar2/python-progressbar2-vl.spec

@@ -0,0 +1,157 @@
+%bcond_with tests
+
+%global srcname progressbar2
+
+%global desc %{expand: \
+A text progress bar is typically used to display the progress of a long running
+operation, providing a visual cue that processing is underway.
+
+The ProgressBar class manages the current progress, and the format of the line
+is given by a number of widgets.
+
+The progressbar module is very easy to use, yet very powerful. It will also
+automatically enable features like auto-resizing when the system supports it.}
+
+Name:           python-%{srcname}
+Version:        3.53.1
+Release:        1%{?dist}
+Summary:        A Progressbar library to provide visual progress to long running operations
+Group:          programming
+Vendor:         Project Vine
+Distribution:   Vine Linux
+
+License:        BSD
+URL:            https://pypi.python.org/pypi/%{srcname}
+Source0:        %pypi_source
+
+BuildArch:      noarch
+BuildRequires:  python3-devel
+
+%description
+%{desc}
+
+
+%package -n python3-%{srcname}
+Summary:        %{summary}
+Group:          programming
+Requires:       python3
+Requires:       python3-six
+BuildRequires:  python3-utils
+BuildRequires:  python3-six
+BuildRequires:  python3-setuptools
+BuildRequires:  python3-sphinx
+%if %{with tests}
+BuildRequires:  %{py3_dist freezegun} >= 0.3.10
+%endif
+
+# obsolete python-progressbar
+Obsoletes:      python3-progressbar < 2.3-14
+Provides:       python3-progressbar == %{version}
+
+%{?python_provide:%python_provide python3-%{srcname}}
+
+%description -n python3-%{srcname}
+%{desc}
+
+
+%prep
+%autosetup -n %{srcname}-%{version}
+rm -rfv %{srcname}.egg-info
+
+find . -name '*.pyc' -print -delete
+find . -name '*.swp' -print -delete
+rm -rfv tests/__pycache__/
+
+
+%build
+%py3_build
+
+
+%install
+%py3_install
+
+
+%check
+%if %{with tests}
+PYTHONPATH=. %pytest tests
+%endif
+
+
+%files -n python3-%{srcname}
+%license LICENSE
+%doc README.rst CHANGES.rst CONTRIBUTING.rst
+%{python3_sitelib}/%{srcname}-%{version}-py3.*.egg-info/
+%{python3_sitelib}/progressbar
+
+
+%changelog
+* Tue Feb 23 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 3.53.1-1
+- initial build for Vine Linux.
+- new upstream release.
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.52.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Tue Sep 01 2020 Petr Viktorin <pviktori@redhat.com> - 3.52.1-1
+- Update to 3.52.1
+  Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1873701
+  The only behavior change is that ProgressBar gets a `start_time`
+  keyword argument, which can override the starting time (e.g. for
+  ETA calculations).
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.51.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Sat Jun 27 2020 Petr Viktorin <pviktori@redhat.com> - 3.51.4-1
+- Update to 3.51.4
+- Run pytest directly
+
+* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 3.47.0-2
+- Rebuilt for Python 3.9
+
+* Wed Feb 12 2020 Petr Viktorin <pviktori@redhat.com> - 3.47.0-1
+- Update to latest upstream version
+  https://github.com/WoLpH/python-progressbar/compare/v3.39.3...vv3.47.0
+  Highlights:
+  - Rate limiting
+  - Added proper support for non-terminal output
+  - Add MultiProgressBar
+
+* Wed Feb 12 2020 Petr Viktorin <pviktori@redhat.com> - 3.39.3-7
+- Remove linting BuildRequires
+  https://bugzilla.redhat.com/show_bug.cgi?id=1795451
+- Fix egg-info glob to work for Python 3.10+
+
+* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.39.3-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 3.39.3-5
+- Rebuilt for Python 3.8.0rc1 (#1748018)
+
+* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 3.39.3-4
+- Rebuilt for Python 3.8
+
+* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.39.3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Sun May 12 2019 Orion Poplawski <orion@nwra.com> - 3.39.3-2
+- Drop unneeded BR on pytest-cache
+
+* Wed Apr 10 2019 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 3.39.3-1
+- Update to 3.39.3
+
+* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.39.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Wed Dec 19 2018 Petr Viktorin <pviktori@redhat.com> - 3.39.2-2
+- Provide python3-progressbar
+
+* Wed Dec 19 2018 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 3.39.2-1
+- Update to latest upstream commit
+- Should fix failing tests
+
+* Thu Dec 13 2018 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 3.38.0-1
+- Check tests and file issue upstream
+- Initial build
+- Drop py2 subpackage
+- Obsolete python-progressbar

+ 9 - 10
p/python-requests/python-requests-vl.spec

@@ -1,6 +1,6 @@
 Summary: Python HTTP for Humans
 Name: python-requests
-Version: 2.24.0
+Version: 2.25.1
 Release: 1%{?_dist_release}
 Group: programming
 Vendor: Project Vine
@@ -28,13 +28,10 @@ Patch3: requests-2.12.4-tests_nonet.patch
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: python
-Requires: python-urllib3
-Requires: python-chardet
-Requires: python-idna
 BuildRequires: python-rpm-macros
 BuildRequires: python3-rpm-macros
 BuildRequires: python-devel
-BuildRequires: python-setuptools
+BuildRequires: python2-setuptools
 BuildRequires: python3-devel
 BuildRequires: python3-rpm-macros
 BuildRequires: python3-setuptools
@@ -47,9 +44,6 @@ Requests is an Apache2 Licensed HTTP library, written in Python, for human being
 Summary: Python HTTP for Humans
 Group: programming
 Requires: python3
-Requires: python3-urllib3
-Requires: python3-chardet
-Requires: python3-idna
 
 %description -n python3-requests
 Requests is an Apache2 Licensed HTTP library, written in Python, for human beings.
@@ -66,13 +60,13 @@ sed -i '/#!\/usr\/.*python/d' requests/certs.py
 
 
 %build
-%py2_build
+%py_build
 %py3_build
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%py2_install
+%py_install
 %py3_install
 
 
@@ -94,7 +88,12 @@ rm -rf $RPM_BUILD_ROOT
 %{python3_sitelib}/requests
 %{python3_sitelib}/requests-%{version}-py*.egg-info
 
+
 %changelog
+* Tue Feb 23 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.25.1-1
+- new upstream release.
+- updated Patch0.
+
 * Sat Aug 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.24.0-1
 - new upstream release.
 

+ 42 - 11
p/python-rpm-macros/python-rpm-macros-vl.spec

@@ -1,9 +1,8 @@
-%{!?rpmmacrodir:%global rpmmacrodir %{_sysconfdir}/rpm}
-
 Name:           python-rpm-macros
-Version:        3.8
-Release:        1%{?_dist_release}
 Summary:        The unversioned Python RPM macros
+Version:        3.8
+Release:        2%{?_dist_release}
+Group:          programming
 Vendor:         Project Vine
 Distribution:   Vine Linux
 Packager:       tomop
@@ -15,9 +14,16 @@ Source2:        macros.python2
 Source3:        macros.python3
 Source4:        macros.platform-python
 
+Source100:      python.attr
+Source101:      pythondist.attr
+Source102:      pythondistdeps.py
+# for apt (rich operators of dependencies are not supported)
+Patch1000:      pythondistdeps.py-downgrade.patch
+
 BuildArch:      noarch
 # For %%python3_pkgversion used in %%python_provide
 Requires:       python-srpm-macros
+Requires:       python3-packaging
 Obsoletes:      python-macros < 3
 Provides:       python-macros = %{version}-%{release}
 
@@ -28,12 +34,14 @@ implementations should rely on.
 You should not need to install this package manually as the various
 python?-devel packages require it. So install a python-devel package instead.
 
+
 %package -n python-srpm-macros
 Summary:        RPM macros for building Python source packages
 
 %description -n python-srpm-macros
 RPM macros for building Python source packages.
 
+
 %package -n python2-rpm-macros
 Summary:        RPM macros for building Python 2 packages
 # Would need to be different for each release - worth it?
@@ -44,6 +52,7 @@ Requires:       python-srpm-macros
 %description -n python2-rpm-macros
 RPM macros for building Python 2 packages.
 
+
 %package -n python3-rpm-macros
 Summary:        RPM macros for building Python 3 packages
 # Would need to be different for each release - worth it?
@@ -54,6 +63,7 @@ Requires:       python-srpm-macros
 %description -n python3-rpm-macros
 RPM macros for building Python 3 packages.
 
+
 #%package -n platform-python-rpm-macros
 #Summary:        RPM macros for building Platform-Python packages
 
@@ -62,33 +72,54 @@ RPM macros for building Python 3 packages.
 
 
 %prep
+%setup -T -c
+cp -f %{SOURCE102} ./
+%patch1000 -p0
+
 
 %build
 
+
 %install
-mkdir -p %{buildroot}/%{rpmmacrodir}
+mkdir -p %{buildroot}%{_rpmmacrodir}
 install -m 644 %{SOURCE0} %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} \
-  %{buildroot}/%{rpmmacrodir}/
+  %{buildroot}%{_rpmmacrodir}/
+
+mkdir -p %{buildroot}%{_fileattrsdir}
+install -m 644 %{SOURCE100} %{SOURCE101} \
+  %{buildroot}%{_fileattrsdir}/
+
+mkdir -p %{buildroot}%{_rpmconfigdir}
+install -m 755 pythondistdeps.py \
+  %{buildroot}%{_rpmconfigdir}/
+
+sed -i -e 's|#!/usr/bin/python|#!/usr/bin/python3|' \
+  %{buildroot}%{_rpmconfigdir}/pythondistdeps.py
 
 
 %files
-%{rpmmacrodir}/macros.python
+%{_rpmmacrodir}/macros.python
+%{_rpmconfigdir}/pythondistdeps.py
+%{_fileattrsdir}/*
 
 %files -n python-srpm-macros
-%{rpmmacrodir}/macros.python-srpm
+%{_rpmmacrodir}/macros.python-srpm
 
 %files -n python2-rpm-macros
-%{rpmmacrodir}/macros.python2
+%{_rpmmacrodir}/macros.python2
 
 %files -n python3-rpm-macros
-%{rpmmacrodir}/macros.python3
+%{_rpmmacrodir}/macros.python3
 
 #%files -n platform-python-rpm-macros
 #%{rpmmacrodir}/macros.platform-python
-%exclude %{rpmmacrodir}/macros.platform-python
+%exclude %{_rpmmacrodir}/macros.platform-python
 
 
 %changelog
+* Mon Feb 22 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 3.8-2
+- added scripts.
+
 * Wed Apr 08 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 3.8-1
 - updated to 3.8.
 

+ 9 - 33
p/python-setuptools/python-setuptools-vl.spec

@@ -1,31 +1,27 @@
 %bcond_without bootstrap
-%bcond_without python3
 
 %global srcname setuptools
 %define _unpackaged_files_terminate_build 1
 
 %global python_wheelname %{srcname}-%{version}-py2.py3-none-any.whl
-%if %{with python3}
 %global python3_wheelname %python_wheelname
 %global python3_record %{python3_sitelib}/%{srcname}-%{version}.dist-info/RECORD
-%endif
 
 Name:           python-setuptools
-Version:        49.6.0
+Version:        53.0.0
 Release:        1%{?_dist_release}
 Summary:        Download, build, install, upgrade, and uninstall Python packages
 Summary(ja):     Python パッケージのダウンロード、ビルド、インストール、アップグレードおよびアンインストール用ツール
 Group:          programming
 License:        PSFL/ZPL
 URL:            https://pypi.python.org/pypi/setuptools
-Source0:        https://files.pythonhosted.org/packages/source/s/%{srcname}/%{srcname}-%{version}.zip
+Source0:        https://files.pythonhosted.org/packages/source/s/%{srcname}/%{srcname}-%{version}.tar.gz
 Source1:        psfl.txt
 Source2:        zpl.txt
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 
 BuildArch:      noarch
 BuildRequires:  python-rpm-macros
-%if %{with python3}
 BuildRequires:  python3
 BuildRequires:  python3-devel
 BuildRequires:  python3-rpm-macros
@@ -33,7 +29,6 @@ BuildRequires:  python3-rpm-macros
 BuildRequires:  python3-pip
 BuildRequires:  python3-wheel
 %endif # without bootstrap
-%endif # with python3
 
 %description
 setuptools is a collection of enhancements to the Python distutils that allow
@@ -47,7 +42,6 @@ setuptools は Python distutils の拡張機能を集めたツールです。
 です。
 
 
-%if %{with python3}
 %package -n     python3-setuptools
 Summary:        Download, build, install, upgrade, and uninstall Python3 packages
 Summary(ja):    Python3 パッケージのダウンロード、ビルド、インストール、アップグレードおよびアンインストール用ツール
@@ -64,7 +58,6 @@ setuptools は Python distutils の拡張機能を集めたツールです。
 このツールにより Python パッケージの構築や配布が簡単に行えるように
 なります。特に他のパッケージに依存しているパッケージを扱う際に便利
 です。
-%endif
 
 
 %prep
@@ -90,13 +83,11 @@ rm -f setuptools/*.exe
 rm setuptools/tests/test_integration.py
 
 %build
-%if %{with python3}
 %if %{without bootstrap}
 %py3_build_wheel
 %else
 %py3_build
 %endif
-%endif # with python3
 
 %install
 rm -rf %{buildroot}
@@ -104,18 +95,14 @@ rm -rf %{buildroot}
 # Must do the python3 install first because the scripts in /usr/bin are
 # overwritten with every setup.py install (and we want the python2 version to
 # be the default for now).
-%if %{with python3}
 %if %{without bootstrap}
 %py3_install_wheel %{python3_wheelname}
-
-# Remove /usr/bin/easy_install from the record as later on we delete the file
-sed -i '/\/usr\/bin\/easy_install,/d' %{buildroot}%{python3_record}
 %else
 %py3_install
 %endif
 
 # TODO: we have to remove this by hand now, but it'd be nice if we wouldn't have to
-rm %{buildroot}%{_bindir}/easy_install
+rm -f %{buildroot}%{_bindir}/easy_install
 
 rm -rf %{buildroot}%{python3_sitelib}/setuptools/tests
 %if %{without bootstrap}
@@ -123,49 +110,38 @@ sed -i '/^setuptools\/tests\//d' %{buildroot}%{python3_record}
 %endif
 
 find %{buildroot}%{python3_sitelib} -name '*.exe' | xargs rm -f
-%endif # with python3
 
 # Don't ship these
-rm -r docs/{Makefile,conf.py,_*}
+rm -rf docs/{Makefile,conf.py,_*}
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
-%if %{with python3}
 %pre -n python3-setuptools
 if [ ! -L %{_bindir}/easy_install ]; then
   rm -f %{_bindir}/easy_install
 fi
-
-%post -n python3-setuptools
-/sbin/update-alternatives \
-  --install %{_bindir}/easy_install easy_install \
-  %{_bindir}/easy_install-%{python3_version} %{python3_version_nodots}
-
-%preun -n python3-setuptools
-if [ "$1" = "0" ]; then
+if [ -x %{_bindir}/easy_install-3.8 ]; then
   /sbin/update-alternatives \
     --remove easy_install %{_bindir}/easy_install-%{python3_version}
 fi
-%endif
 
-%if %{with python3}
+
 %files -n python3-setuptools
 %license LICENSE
 %doc docs/* CHANGES.rst README.rst
-%{python3_sitelib}/easy_install.py
 %{python3_sitelib}/distutils-precedence.pth
 %{python3_sitelib}/pkg_resources/
 %{python3_sitelib}/setuptools*/
-%{python3_sitelib}/__pycache__/*
 %{python3_sitelib}/_distutils_hack
-%{_bindir}/easy_install-3*
-%endif
 
 
 %changelog
+* Tue Feb 23 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 53.0.0-1
+- updated to 53.0.0.
+
 * Sat Aug 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 49.6.0-1
 - updated to 49.6.0.
 - built with python3 only.

+ 6 - 7
p/python-six/python-six-vl.spec

@@ -3,8 +3,7 @@
 # Basic Information
 Name:		python-six
 Version:	1.15.0
-Release:	1%{?_dist_release}
-# /usr/share/doc/rpm-4.11.2/GROUPS_for_vine.txt を参照して Group を修正してください。
+Release:	2%{?_dist_release}
 Group:		programming
 Vendor:		Project Vine
 Distribution:	Vine Linux
@@ -23,11 +22,8 @@ BuildArch:	noarch
 Requires:	python
 BuildRequires:  python-devel
 BuildRequires:  python-setuptools
-BuildRequires:  python-rpm-macros
-BuildRequires:  python2-rpm-macros
 BuildRequires:  python3-devel
 BuildRequires:  python3-setuptools
-BuildRequires:  python3-rpm-macros
 
 %description
 for smoothing over the differences between the Python versions with the goal of
@@ -75,13 +71,13 @@ list: http://mail.python.org/mailman/listinfo/python-porting
 
 
 %build
-%py2_build
+%py_build
 %py3_build
 
 
 %install
 %{__rm} -rf ${RPM_BUILD_ROOT}
-%py2_install
+%py_install
 %py3_install
 
 
@@ -106,6 +102,9 @@ list: http://mail.python.org/mailman/listinfo/python-porting
 
 
 %changelog
+* Tue Feb 23 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.15.0-2
+- rebuilt with rpm-4.16.
+
 * Sat Aug 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.15.0-1
 - new upstream release.
 

+ 5 - 2
p/python-urllib3/python-urllib3-vl.spec

@@ -5,7 +5,7 @@
 
 Summary:        Python HTTP library with thread-safe connection pooling and file post
 Name:           python-%{srcname}
-Version:        1.25.10
+Version:        1.26.3
 Release:        1%{?_dist_release}
 Group:          programming
 Vendor:         Project Vine
@@ -34,7 +34,7 @@ Requires:       python-pysocks
 BuildRequires:  python-devel
 BuildRequires:  python-rpm-macros
 BuildRequires:  python2-rpm-macros
-BuildRequires:  python-setuptools
+BuildRequires:  python2-setuptools
 
 %description
 Python HTTP module with connection pooling and file POST abilities.
@@ -120,6 +120,9 @@ ln -s %{python3_sitelib}/__pycache__/six.cpython-%{python3_version_nodots}.pyc \
 
 
 %changelog
+* Tue Feb 23 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.26.3-1
+- new upstream release.
+
 * Sat Aug 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.25.10-1
 - new upstream release.
 

+ 136 - 0
p/python-utils/python-utils-vl.spec

@@ -0,0 +1,136 @@
+Name:           python-utils
+Version:        2.5.6
+Release:        1%{?_dist_release}
+Summary:        Python Utils is a module with some convenient utilities
+
+License:        BSD
+URL:            https://github.com/WoLpH/python-utils
+Source0:        %{url}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
+BuildArch:      noarch
+
+BuildRequires:  make
+BuildRequires:  python3-devel
+#BuildRequires:  python3-pytest-runner
+#BuildRequires:  python3-pytest
+BuildRequires:  python3-setuptools
+BuildRequires:  python3-six
+BuildRequires:  python3-sphinx
+
+%?python_enable_dependency_generator
+
+%description
+Python Utils is a collection of small Python functions and classes which
+make common patterns shorter and easier. This module makes it easy to
+execute common tasks in Python scripts such as converting text to numbers
+and making sure a string is in unicode or bytes format.
+
+
+%package -n     python3-utils
+Summary:        %{summary}
+%{?python_provide:%python_provide python3-utils}
+
+%description -n python3-utils
+Python Utils is a collection of small Python functions and classes which
+make common patterns shorter and easier. This module makes it easy to
+execute common tasks in Python scripts such as converting text to numbers
+and making sure a string is in unicode or bytes format.
+
+
+%prep
+%autosetup -p1 -n %{name}-%{version}
+# Remove bundled egg-info
+rm -rf %{name}.egg-info
+
+# Stop linting code in %%check and measuring coverage, this is upstream's business
+sed -Ei '/--(cov|pep8|flakes)/d' pytest.ini
+
+
+%build
+%py3_build
+# generate html docs
+sphinx-build docs html
+# remove the sphinx-build leftovers
+rm -rf html/{.doctrees,.buildinfo,*.inv}
+
+
+%install
+%py3_install
+
+
+#%check
+#%{__python3} setup.py pytest --addopts --ignore=build
+
+
+%files -n python3-utils
+%doc README.rst html
+%license LICENSE
+%{python3_sitelib}/python_utils
+%{python3_sitelib}/python_utils-%{version}-py%{python3_version}.egg-info
+
+
+%changelog
+* Tue Feb 23 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 2.5.6-1
+- initial build for Vine Linux.
+- new upstream release.
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Mon Jun 01 2020 Charalampos Stratakis <cstratak@redhat.com> - 2.4.0-1
+- Update to 2.4.0 (#1809705)
+
+* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 2.3.0-10
+- Rebuilt for Python 3.9
+
+* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.0-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 2.3.0-8
+- Rebuilt for Python 3.8.0rc1 (#1748018)
+
+* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 2.3.0-7
+- Rebuilt for Python 3.8
+
+* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.0-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Mon May 13 2019 Orion Poplawski <orion@nwra.com> - 2.3.0-5
+- Add patch to build docs with python 3 (bugz#1709063)
+- Drop unneeded BR on pytest-cache
+
+* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 2.3.0-2
+- Rebuilt for Python 3.7
+
+* Sat May 05 2018 Miro Hrončok <mhroncok@redhat.com> - 2.3.0-1
+- New version 2.3.0 (#1474328)
+- Use automatic dependency generator
+
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Thu Jun 15 2017 Miro Hrončok <mhroncok@redhat.com> - 2.1.0-1
+- New version 2.1.0 (#1438625)
+
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Thu Dec 22 2016 Miro Hrončok <mhroncok@redhat.com> - 2.0.1-2
+- Rebuild for Python 3.6
+
+* Mon Dec 19 2016 Miro Hrončok <mhroncok@redhat.com> - 2.0.1-1
+- Updated, added LICENSE file
+
+* Sun Dec 04 2016 Miro Hrončok <mhroncok@redhat.com> - 2.0.0-1
+- Initial package

+ 16 - 13
p/python2-setuptools/python2-setuptools-vl.spec

@@ -9,7 +9,7 @@
 
 Name:           python2-setuptools
 Version:        44.1.1
-Release:        1%{?_dist_release}
+Release:        2%{?_dist_release}
 Summary:        Download, build, install, upgrade, and uninstall Python packages
 Summary(ja):     Python パッケージのダウンロード、ビルド、インストール、アップグレードおよびアンインストール用ツール
 Group:          programming
@@ -26,6 +26,7 @@ BuildRequires:  python-rpm-macros
 %if %{without bootstrap}
 BuildRequires:  python-pip
 BuildRequires:  python-wheel
+BuildConflicts: python-setuptools < %{version}
 %endif # without bootstrap
 Requires(post,postun): alternatives
 Obsoletes: python-setuptools < %{version}
@@ -92,7 +93,7 @@ find %{buildroot}%{python_sitelib} -name '*.exe' | xargs rm -f
 
 # Don't ship these
 rm -r docs/{Makefile,conf.py,_*}
-rm %{buildroot}%{_bindir}/easy_install
+rm -f %{buildroot}%{_bindir}/easy_install
 
 
 %clean
@@ -100,22 +101,21 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %pre
+update-alternatives --remove easy_install %{_bindir}/easy_install-%{python_version} ||:
 if [ ! -L %{_bindir}/easy_install ]; then
   rm -f %{_bindir}/easy_install
 fi
 
-%post
-update-alternatives --remove easy_install %{_bindir}/easy_install-%{python_version} ||:
-update-alternatives --install %{_bindir}/easy_install easy_install \
-	                      %{_bindir}/easy_install-%{python_version} 27
-
-%triggerpostun -- python-setuptools < 5.4.2-2
-update-alternatives --auto easy_install
+%posttrans
+if [ ! -L %{_bindir}/easy_install ]; then
+  ln -sf easy_install-%{python_version} %{_bindir}/easy_install
+fi
 
 %preun
 if [ "$1" = "0" ]
 then
-  update-alternatives --remove easy_install %{_bindir}/easy_install-%{python_version}
+  update-alternatives --remove easy_install %{_bindir}/easy_install-%{python_version} ||:
+  rm -f %{_bindir}/easy_install
 fi
 
 
@@ -124,17 +124,20 @@ fi
 %license LICENSE
 %doc docs/* CHANGES.rst README.rst
 %{python_sitelib}/*
-%{_bindir}/easy_install-2*
+%{_bindir}/easy_install*
 
 
 %changelog
+* Tue Feb 23 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 44.1.1-2
+- rebuilt with rpm-4.16.
+
 * Sat Aug 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 44.1.1-1
-- updated to 44.1.1.
+- updated to 44.1.1 (the last release for Python2).
 - changed %%name.
 - built with python2 only.
 
 * Wed Apr 08 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 44.1.0-1
-- updated to 44.1.0 (last release for Python2).
+- updated to 44.1.0.
 
 * Sun Dec 17 2017 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 38.2.4-1
 - new upstream release.

+ 28 - 29
r/rpmdevtools/rpmdevtools-vl.spec

@@ -1,40 +1,37 @@
-%bcond_with python3
-
-%global spectool_version 1.0.10
+%global spectool_version 1.1.0
 %global _emacs_sitestartdir /usr/share/emacs/site-lisp
 
 Name:           rpmdevtools
-Version:        8.10
-Release:        11%{?_dist_release}
 Summary:        RPM Development Tools
+Version:        9.3
+Release:        1%{?_dist_release}
+Group:          programming
+Vendor:         Project Vine
+Distribution:   Vine Linux
 
 # rpmdev-setuptree is GPLv2, everything else GPLv2+
 License:        GPLv2+ and GPLv2
 URL:            https://pagure.io/rpmdevtools
 Source0:        https://releases.pagure.org/rpmdevtools/%{name}-%{version}.tar.xz
 
-Vendor:         Project Vine
-Distribution:   Vine Linux
-
-# Backports from upstream
-Patch0001:      0001-bumpspec-checksig-Avoid-python-3.6-regex-related-dep.patch
-Patch0002:      0001-Limit-newVersion-s-re.sub-to-a-single-replacement.patch
-
+# Use Accept-Encoding: identity together with decode_content=False
+# This is to avoid text files downloaded gzipped
+Patch1:         https://pagure.io/rpmdevtools/pull-request/77.patch
+# Fedora-specific downstream patches
+## Force legacy datestamp by default until rhbz#1715412 is resolved
+Patch1001:      0001-Force-legacy-datestamp-while-RHBZ-1715412-is-still-a.patch
 # Vine patch(es)
-Patch1000:      rpmdevtools-vine.patch
+Patch2000:      rpmdevtools-vine.patch
 
 BuildArch:      noarch
 # help2man, pod2man, *python for creating man pages
 BuildRequires:  help2man
 BuildRequires:  %{_bindir}/pod2man
 BuildRequires:  perl
-%if %{with python3}
 BuildRequires:  python3
-BuildRequires:  rpm-python3
-%else
-BuildRequires:  python >= 2.7
-BuildRequires:  rpm-python
-%endif
+BuildRequires:  python3-rpm
+BuildRequires:  python3-requests
+BuildRequires:  python3-progressbar2
 # emacs-common >= 1:22.3-3 for macros.emacs
 BuildRequires:  emacsen-common
 BuildRequires:  bash-completion
@@ -46,13 +43,10 @@ Requires:       file
 Requires:       findutils
 Requires:       gawk
 Requires:       grep
-Requires:       rpm-build >= 4.4.2.3
-%if %{with python3}
-Requires:       rpm-python3
-%else
-Requires:       python >= 2.4
-Requires:       rpm-python
-%endif
+Requires:       rpm-build >= 4.16.0.0
+Requires:       python3-rpm
+Requires:       python3-requests
+Requires:       python3-progressbar2
 Requires:       sed
 
 %description
@@ -75,10 +69,8 @@ rpmdev-bumpspec     Bump revision in specfile
 
 %prep
 %autosetup -p1
-%if %{with python3}
 grep -lF "%{_bindir}/python " * \
 | xargs sed -i -e "s|%{_bindir}/python |%{_bindir}/python3 |"
-%endif
 
 
 %build
@@ -88,7 +80,6 @@ grep -lF "%{_bindir}/python " * \
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
 %make_install
 
 echo %%{_datadir}/bash-completion > %{name}.files
@@ -105,6 +96,10 @@ for dir in %{_emacs_sitestartdir} ; do
   touch $RPM_BUILD_ROOT$dir/rpmdev-init.elc
 done
 
+# For backwards compatibility
+ln -sr %{buildroot}%{_bindir}/rpmdev-spectool %{buildroot}%{_bindir}/spectool
+echo ".so man1/rpmdev-spectool.1" > %{buildroot}%{_mandir}/man1/spectool.1
+
 
 %files -f %{name}.files
 %license COPYING
@@ -122,6 +117,10 @@ done
 
 
 %changelog
+* Tue Feb 23 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 9.3-1
+- new upstream release.
+- updated patches.
+
 * Tue Sep 03 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 8.10-11
 - rpmdev-bumpspec: made to set %%_dist_release to %%nil.
 

+ 17 - 8
r/rpmver/rpmver-vl.spec

@@ -1,12 +1,13 @@
 Name:           rpmver
 Version:        2.1
-Release:        9%{?_dist_release}
+Release:        10%{?_dist_release}
 Summary:        RPM version comparing tool
 Summary(ja):    RPM バージョン比較ツール
-
 Group:          Applications/System
-License:        GPLv2
+Vendor:         Project Vine
+Distribution:   Vine Linux
 
+License:        GPLv2
 Source0:        rpmver-%{version}.tar.bz2
 Patch1:         rpmver-2.1-rpm48.patch
 
@@ -14,9 +15,6 @@ Buildroot:      %{_tmppath}/%{name}-%{version}-root
 BuildRequires:  popt-devel
 BuildRequires:  rpm-devel
 
-Vendor:         Project Vine
-Distribution:   Vine Linux
-
 %description
 RPM version comparing tool which allows one to know how two given versions
 relate to each other.
@@ -25,26 +23,37 @@ relate to each other.
 指定した2つのバージョンの関係を知ることができる RPM バージョン比較ツールです。
 
 
+%debug_package
+
+
 %prep
 %setup -q
 %patch1 -p1
 
+
 %build
-make CFLAGS="$RPM_OPT_FLAGS -D_RPM_4_4_COMPAT"
+make CFLAGS="$RPM_OPT_FLAGS"
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -m755 -D rpmver $RPM_BUILD_ROOT%{_bindir}/%{name}
 
+
 %clean 
 rm -rf $RPM_BUILD_ROOT
 
+
 %files
 %defattr(-,root,root)
-%doc LICENSE
+%license LICENSE
 %{_bindir}/%{name}
 
+
 %changelog
+* Mon Feb 22 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.1-10
+- rebuilt with current environment.
+
 * Fri Feb 20 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 2.1-9
 - rebuilt on current VineSeed
 - changed BR: popt-devel instead of popt

+ 78 - 0
v/vine-rpm-macros/vine-rpm-macros-vl.spec

@@ -0,0 +1,78 @@
+Summary:        rpm macros for Vine Linux
+Summary(ja):    Vine Linux用rpmマクロ
+Name:           vine-rpm-macros
+Version:        3
+Release:        1%{?_dist_release}
+Group:          system
+Vendor:         Project Vine
+Distribution:   Vine Linux
+
+License:        GPL2
+Source0:        macros.vine
+
+BuildRoot:      %{_tmppath}/%{name}-%{version}-root
+BuildArch:      noarch
+Requires:       rpm
+
+%description
+This package contains rpm macros for Vine Linux.
+
+%description -l ja
+このパッケージはVine Linux用のrpmマクロを収録しています。
+
+
+%package -n     vine-rpm-build-macros
+Summary:        rpm macros to build packages for Vine Linux.
+Summary(ja):    Vine Linuxパッケージ作成用rpmマクロ
+Requires:       rpm-build
+Requires:       perl-generators
+Requires:       python-rpm-macros
+Requires:       python3-rpm-macros
+
+%description -n vine-rpm-build-macros
+This package contains rpm macros to build packages for Vine Linux.
+
+%description -n vine-rpm-build-macros -l ja
+このパッケージはVine Linuxのパッケージ作成用rpmマクロを収録しています。
+
+
+%debug_package
+
+
+%prep
+%setup -n vine-rpm-macros-%{version} -T -c
+
+
+%build
+
+
+%install
+%{__rm} -rf %{buildroot}
+install -Dpm644 %{SOURCE0} %{buildroot}/usr/lib/rpm/macros.d/macros.vine
+#install -Dpm644 %{SOURCE1} %{buildroot}%{_fileattrsdir}/metainfo.attr
+#install -Dpm755 %{SOURCE2} %{buildroot}%{_rpmconfigdir}/metainfo.prov
+
+
+%clean
+%{__rm} -rf %{buildroot}
+
+
+%files
+%defattr(-,root,root)
+/usr/lib/rpm/macros.d/*
+
+%files -n vine-rpm-build-macros
+%defattr(-,root,root)
+#{_fileattrsdir}/*
+#{_rpmconfigdir}/metainfo.prov
+
+
+%changelog
+* Wed Feb 24 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3-1
+- imported some scriptlets from redhat-rpm-config.
+
+* Mon Feb 22 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2-1
+- built for rpm-4.16.
+
+* Sat May 09 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1-1
+- initial build.