updated 5 packages

git-2.30.1-1

imake-1.0.8-1

irqbalance-1.7.0-1

meson-0.57.1-1

vine-rpm-macros-4-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@12559 ec354946-7b23-47d6-9f5a-488ba84defc7

g/git/git-vl.spec

@@ -5,11 +5,11 @@
 
 # Pass --without docs to rpmbuild if you don't want the documentation
 Name:           git
-Version:        2.26.2
+Version:        2.30.1
 Release:        1%{?_dist_release}
 Summary:        Core git tools
 Summary(ja):    Core git ツール
-Group:          Development/Tools
+Group:          programming
 Vendor:         Project Vine
 Distribution:   Vine Linux
 Packager:       iwaim
@@ -54,14 +54,15 @@ The git rpm installs the core tools with minimal dependencies.  To
 install all git packages, including tools for integrating with other
 SCMs, install the git-all meta-package.
 
+
 %package all
 Summary:	Meta-package to pull in all git tools
 Summary(ja):	すべての git ツール
-Group:		Development/Tools
+Group:		programming
 Requires:	git = %{version}-%{release}
 Requires:	git-svn = %{version}-%{release}
 Requires:	git-cvs = %{version}-%{release}
-%if "%{?_dist_release}" != "vl4" && %{with arch}
+%if %{with arch}
 Requires:	git-arch = %{version}-%{release}
 %endif
 Requires:	git-email = %{version}-%{release}
@@ -82,15 +83,16 @@ This is a dummy package which brings in all subpackages.
 %package daemon
 Summary:	Git protocol daemon
 Summary(ja):	Git プロトコルデーモン
-Group:		Development/Tools
+Group:		programming,servers
 Requires:	git = %{version}-%{release}
 %description daemon
 The git daemon for supporting git:// access to git repositories
 
+
 %package -n gitweb
 Summary:        Simple web interface to git repositories
 Summary(ja):    git リポジトリへのシンプルな Web インタフェース
-Group:          Development/Tools
+Group:          programming,servers
 Requires:       git = %{version}-%{release}
 
 %description -n gitweb
@@ -100,32 +102,35 @@ Simple web interface to track changes in git repositories
 %package svn
 Summary:        Git tools for importing Subversion repositories
 Summary(ja):    Subversion リポジトリを git へインポートするためのツール
-Group:          Development/Tools
+Group:          programming
 Requires:       git = %{version}-%{release}, subversion, perl(Term::ReadKey)
 Requires:       perl(SVN::Core)
 %description svn
 Git tools for importing Subversion repositories.
 
+
 %package cvs
 Summary:        Git tools for importing CVS repositories
 Summary(ja):    CVS リポジトリを git へインポートするためのツール
-Group:          Development/Tools
+Group:          programming
 Requires:       git = %{version}-%{release}, cvs, cvsps
 %description cvs
 Git tools for importing CVS repositories.
 
+
 %package contrib
 Summary:        Git contrib tools
-Group:          Development/Tools
+Group:          programming
 Requires:       git = %{version}-%{release}
 %description contrib
 Git contrib tools
 
-%if "%{?_dist_release}" != "vl4" && %{with arch}
+
+%if %{with arch}
 %package arch
 Summary:        Git tools for importing Arch repositories
 Summary(ja):    Arch リポジトリを git へインポートするためのツール
-Group:          Development/Tools
+Group:          programming
 Requires:       git = %{version}-%{release}, tla
 %description arch
 Git tools for importing Arch repositories.
@@ -134,69 +139,69 @@ Git tools for importing Arch repositories.
 %package email
 Summary:        Git tools for sending email
 Summary(ja):    Eメールを送るための git ツール
-Group:          Development/Tools
+Group:          programming
 Requires:	git = %{version}-%{release}, perl-Git = %{version}-%{release}
 %description email
 Git tools for sending email.
 
+
 %package gui
 Summary:        Git GUI tool
 Summary(ja):    Git の GUI ツール
-Group:          Development/Tools
+Group:          programming
 Requires:       git = %{version}-%{release}, tk
 %description gui
 Git GUI tool.
 
+
 %package -n gitk
 Summary:        Git revision tree visualiser
 Summary(ja):    Git リビジョンツリー可視化ツール
-Group:          Development/Tools
+Group:          programming
 Requires:       git = %{version}-%{release}, tk
 %description -n gitk
 Git revision tree visualiser.
 
+
 %package -n perl-Git
 Summary:        Perl interface to Git
 Summary(ja):    Git の perl インタフェース
-Group:          Development/Libraries
+Group:          programming
 Requires:       git = %{version}-%{release}, perl(Error), perl-MailTools
-%if "%{?_dist_release}" == "vl4"
-Requires:       perl = %(rpm -q --qf '%%{epoch}:%%{version}' perl)
-%else
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-%endif
 #BuildRequires:  perl(Error), perl(ExtUtils::MakeMaker)
 
 %description -n perl-Git
 Perl interface to Git.
 
+
 %package -n emacs-git
-Summary:       Git version control system support for Emacs
-Summary(ja):   Emacs の Git サポート
-Group:         Applications/Editors
-Requires:      git = %{version}-%{release}, emacsen-common
+Summary:        Git version control system support for Emacs
+Summary(ja):    Emacs の Git サポート
+Group:          programming
+Requires:       git = %{version}-%{release}, emacsen-common
 
 %description -n emacs-git
 %{summary}.
 
+
 %package devel
 Summary:	Header files for git-core
 Summary(ja):	git-core 用ヘッダファイル
-Group:		Development/Libraries
+Group:		programming
 
 %description devel
 Header files for git-core.
 
+
+%debug_package
+
+
 %prep
 %setup -q
 %patch0 -p1
 %patch1000 -p1
 
-# for pcre-8.12
-%if %{?_dist_release} == "vl6"
-%{__perl} -pi -e "s|#include <pcre.h>|#include <pcre/pcre.h>|" grep.h
-%endif
-
 %__mv contrib/diff-highlight/README contrib/diff-highlight/README.diff-highlight
 
 # Filter bogus perl requires
@@ -209,6 +214,7 @@ EOF
 %global __perl_requires %{_builddir}/%{name}-%{version}/%{name}-req
 chmod +x %{__perl_requires}
 
+
 %build
 make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -I%{_includedir/pcre}" \
      ETC_GITCONFIG=/etc/gitconfig \
@@ -221,6 +227,7 @@ pushd contrib/diff-highlight
 make diff-highlight
 popd
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" DESTDIR=$RPM_BUILD_ROOT \
@@ -245,7 +252,6 @@ rm -f %{buildroot}%{_mandir}/man1/git-archimport.1*
 rm -f %{buildroot}/Documentation/git-archimport.html
 %endif
 
-
 # perl-Git
 rm -rf $RPM_BUILD_ROOT%{perl_vendorlib}/FromCPAN
 
@@ -265,7 +271,6 @@ install -m644 %{SOURCE1} %{SOURCE12} $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/
 # install  script( bytecompile el and install elc , remove )
 
 %_installemacsenscript git %{SOURCE10}
-
 %_removeemacsenscript  git %{SOURCE11}
 
 mkdir -p $RPM_BUILD_ROOT/%{_var}/lib/git
@@ -315,31 +320,24 @@ popd
 
 %find_lang %{name}
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %post -n emacs-git
 
 # bytecompile and install
-
 if [ "$1" = 2 ]; then
-
 %_emacsenPackageRemove git
-
 fi
-
 %_addemacsenlist git
-
 %_emacsenPackageInstall git
 
 %preun -n emacs-git
-
 if [ "$1" = 0 ]; then
-
 %_emacsenPackageRemove git
-
 %_removeemacsenlist git
-
 fi
 
 
@@ -380,7 +378,7 @@ fi
 %{_bindir}/diff-highlight
 %{_libexecdir}/git-core/git-credential-gnome-keyring
 
-%if "%{?_dist_release}" != "vl4" && %{with arch}
+%if %{with arch}
 %files arch
 %defattr(-,root,root)
 %doc Documentation/git-archimport.txt
@@ -445,11 +443,14 @@ fi
 %{_libdir}/libgit.a
 %{_libdir}/libgit_xdiff.a
 
-
 %files all
 # No files for you!
 
+
 %changelog
+* Mon Mar 01 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.30.1-1
+- updated to 2.30.1.
+
 * Fri May 01 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.26.2-1
 - updated to 2.26.2.
 

i/imake/imake-vl.spec

@@ -1,16 +1,24 @@
+%global makedepend_version		1.0.6
+%global gccmakedep_version		1.0.3
+%global xorg_cf_files_version	1.0.6
+%global lndir_version			1.0.3
+
 Summary: imake source code configuration and build system
 Name: imake
-Version: 1.0.7
-Release: 2%{?_dist_release}
+Version: 1.0.8
+Release: 1%{?_dist_release}
+Group: programming
+Vendor: Project Vine
+Distribution: Vine Linux
+
 License: MIT/X11
-Group: Development/Tools
-URL: http://www.x.org
-
-Source0: ftp://ftp.x.org/pub/individual/util/%{name}-%{version}.tar.bz2
-Source1: ftp://ftp.x.org/pub/individual/util/makedepend-1.0.5.tar.bz2
-Source2: ftp://ftp.x.org/pub/individual/util/gccmakedep-1.0.3.tar.bz2
-Source3: ftp://ftp.x.org/pub/individual/util/xorg-cf-files-1.0.5.tar.bz2
-Source4: ftp://ftp.x.org/pub/individual/util/lndir-1.0.3.tar.bz2
+URL: https://www.x.org/
+
+Source0: https://www.x.org/pub/individual/util/%{name}-%{version}.tar.bz2
+Source1: https://www.x.org/pub/individual/util/makedepend-%{makedepend_version}.tar.bz2
+Source2: https://www.x.org/pub/individual/util/gccmakedep-%{gccmakedep_version}.tar.bz2
+Source3: https://www.x.org/pub/individual/util/xorg-cf-files-%{xorg_cf_files_version}.tar.bz2
+Source4: https://www.x.org/pub/individual/util/lndir-%{lndir_version}.tar.bz2
 Patch2: xorg-cf-files-1.0.5-redhat.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -30,9 +38,16 @@ build system, and the Imake system is now deprecated, and should not be
 used by new software projects.  Software developers are encouraged to
 migrate software to the GNU autotools system.
 
+
+%debug_package
+
+
 %prep
 %setup -q -c %{name}-%{version} -a1 -a2 -a3 -a4
-%patch2 -p0 -b .redhat
+pushd xorg-cf-files-%{xorg_cf_files_version}
+%patch2 -p1 -b .redhat
+popd
+
 
 %build
 # Build everything
@@ -52,6 +67,7 @@ migrate software to the GNU autotools system.
    done
 }
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -71,9 +87,11 @@ rm -rf $RPM_BUILD_ROOT
    done
 }
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %files
 %defattr(-,root,root,-)
 %doc
@@ -109,7 +127,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/revpath.1.*
 %{_mandir}/man1/xmkmf.1.*
 
+
 %changelog
+* Mon Mar 01 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.0.8-1
+- imake-1.0.8.
+- makedepend-1.0.6.
+- xorg-cf-files-1.0.6.
+
 * Sun Nov  2 2014 Ryoichi INAAGKI <ryo1@toki.waseda.jp> 1.0.7-2
 - moved to Development/Tools Group
 

i/irqbalance/irqbalance-vl.spec

@@ -1,86 +1,122 @@
+%bcond_with systemd
+
 Summary:        Daemon to balance irq's across multiple CPUs/Cores.
 Summary(ja):    複数の CPU 間で IRQ をバランスさせるためのデーモン
 Name:           irqbalance
-Version:        1.4.0
-Release:        1%{?_dist_release}
-Group:          System Environment/Base
-
+Version:        1.7.0
+Release:        1%{?_dist_release}%{?with_systemd:.systemd}
+Group:          system
 Vendor:         Project Vine
 Distribution:   Vine Linux
 
 License:        GPLv3
-URL:            http://irqbalance.github.io/irqbalance/
-Source0:        https://github.com/Irqbalance/irqbalance/archive/v1.4.0.tar.gz#/%{name}-%{version}.tar.gz
+URL:            https://irqbalance.github.io/irqbalance/
+Source0:        https://github.com/Irqbalance/irqbalance/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
 Source1:	%{name}.init
 Source2:	%{name}.sysconfig
+Source100:	%{name}.sysconfig.systemd
 
-Patch1:         %{name}-1.0.4-env-file-path.patch
+Patch1:         %{name}-1.7.0-env-file-path.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 BuildRequires:	autoconf automake libtool
 BuildRequires:	glib2-devel pkgconfig libcap-ng-devel
 BuildRequires:	ncurses-devel
-
-
-%{!?_unitdir:%global _unitdir /lib/systemd/system}
-%{!?_userunitdir:%global _userunitdir /usr/lib/systemd/user}
+%if %{with systemd}
+%{?systemd_requires}
+%else
+Requires(post): chkconfig initscripts
+Requires(preun): chkconfig initscripts
+Requires(postun): initscripts
+%endif
 
 %description
 irqbalance is a daemon that evenly distributes IRQ load across
 multiple CPUs for enhanced performance.
 
+
+%debug_package
+
+
 %prep
 %setup -q
 %patch1 -p1
 
+
 %build
 ./autogen.sh
 %configure
 CFLAGS="%{optflags}" %__make %{?_smp_mflags}
 
+
 %install
 [ "%{buildroot}" != "/" ] && rm -rf %{buildroot}
 mkdir -p %{buildroot}%{_sbindir}
 install irqbalance %{buildroot}%{_sbindir}
-mkdir -p %{buildroot}%{_sysconfdir}/sysconfig
-install %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/irqbalance
 mkdir -p %{buildroot}%{_mandir}/man1
 install irqbalance.1 %{buildroot}%{_mandir}/man1/
 
-mkdir -p %{buildroot}%{_initdir}
-install %{SOURCE1} $RPM_BUILD_ROOT%{_initdir}/irqbalance
+%if %{with systemd}
+install -Dpm0644 ./misc/irqbalance.service %{buildroot}/%{_unitdir}/irqbalance.service
+install -Dpm644 %{SOURCE100} %{buildroot}%{_sysconfdir}/sysconfig/irqbalance
+%else
+install -Dpm755 %{SOURCE1} $RPM_BUILD_ROOT%{_initdir}/irqbalance
+install -Dpm644 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/irqbalance
+%endif
 
-mkdir -p %{buildroot}/%{_unitdir}
-install -D -p -m 0644 ./misc/irqbalance.service %{buildroot}/%{_unitdir}/irqbalance.service
 
 %clean
 [ "%{buildroot}" != "/" ] && rm -rf %{buildroot}
 
 
 %post
-/sbin/chkconfig --add irqbalance
-/sbin/service irqbalance condrestart
+%if %{with systemd}
+%systemd_post irqbalance.service
+%else
+if [ $1 = 1 ]; then
+    /sbin/chkconfig --add irqbalance
+fi
+%endif
 
 %preun
-if [ $1 = 0 ]; then
+%if %{with systemd}
+%systemd_preun irqbalance.service
+%else
+if [ $1 = 0 -o -x /bin/systemctl ]; then
     /sbin/service irqbalance stop > /dev/null 2>&1
     /sbin/chkconfig --del irqbalance
 fi
+%endif
+
+%postun
+%if %{with systemd}
+%systemd_postun_with_restart irqbalance.service
+%else
+if [ $1 -ge 1 ]; then
+    /sbin/service irqbalance condrestart > /dev/null 2>&1 ||:
+fi
+%endif
 
 
 %files
 %defattr(-,root,root)
 %license COPYING
 %doc AUTHORS
-%config(noreplace) %{_sysconfdir}/rc.d/init.d/*
 %config(noreplace) %{_sysconfdir}/sysconfig/*
 %{_sbindir}/*
 %{_mandir}/*/*
-%dir /lib/systemd
-%dir %{_unitdir}
+%if %{with systemd}
 %{_unitdir}/irqbalance.service
+%else
+%config(noreplace) %{_sysconfdir}/rc.d/init.d/*
+%endif
 
 %changelog
+* Mon Mar 01 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.7.0-1
+- updated to 1.7.0.
+- updated Patch1.
+- add systemd support (disabled as default).
+
 * Mon Mar 30 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.4.0-1
 - updated to 1.4.0.
 

m/meson/meson-vl.spec

@@ -5,7 +5,7 @@
 Name:           meson
 Summary:        High productivity build system
 Summary(ja):    高生産性ビルドシステム
-Version:        0.55.0
+Version:        0.57.1
 Release:        1%{?_dist_release}
 Group:          programming
 Vendor:         Project Vine
@@ -14,14 +14,11 @@ Distribution:   Vine Linux
 License:        ASL 2.0
 URL:            https://mesonbuild.com/
 Source0:        https://github.com/mesonbuild/meson/archive/%{version}/%{name}-%{version}.tar.gz
-Source1:        macros.meson
 
 BuildArch:      noarch
 Obsoletes:      %{name}-gui < 0.31.0-3
 BuildRequires:  python3-devel
 BuildRequires:  python3-setuptools
-BuildRequires:  python-rpm-macros
-BuildRequires:  python3-rpm-macros
 BuildRequires:  ninja
 # Various languages
 BuildRequires:  gcc
@@ -53,24 +50,29 @@ productivity. It aims to do this by providing simple, out-of-the-box
 support for modern software development tools and practices, such as
 unit tests, coverage reports, Valgrind, CCache and the like.
 
+
 %prep
 %autosetup -p1
 find -type f -name '*.py' -executable -exec sed -i -e '1s|.*|#!%{__python3}|' {} ';'
 # Remove MPI tests for now because it is complicated to run
 rm -rf "test cases/frameworks/17 mpi"
 
+
 %build
 %py3_build
 
+
 %install
 %py3_install
 
-install -Dpm0644 %{SOURCE1} %{buildroot}%{rpmmacrodir}/macros.%{name}
+install -Dpm0644 data/macros.meson %{buildroot}%{rpmmacrodir}/macros.%{name}
+
 
 %check
 export MESON_PRINT_TEST_OUTPUT=1
 python3 ./run_tests.py ||:
 
+
 %files
 %license COPYING
 %{_bindir}/%{name}
@@ -80,7 +82,12 @@ python3 ./run_tests.py ||:
 %{_mandir}/man1/%{name}.1*
 %{rpmmacrodir}/macros.*
 
+
 %changelog
+* Mon Mar 01 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 0.57.1-1
+- new upstream release.
+- dropped Source1: use macros in tarball.
+
 * Sat Aug 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 0.55.0-1
 - new upstream release.
 

v/vine-rpm-macros/vine-rpm-macros-vl.spec

@@ -1,7 +1,7 @@
 Summary:        rpm macros for Vine Linux
 Summary(ja):    Vine Linux用rpmマクロ
 Name:           vine-rpm-macros
-Version:        3
+Version:        4
 Release:        1%{?_dist_release}
 Group:          system
 Vendor:         Project Vine
@@ -68,6 +68,9 @@ install -Dpm644 %{SOURCE0} %{buildroot}/usr/lib/rpm/macros.d/macros.vine
 
 
 %changelog
+* Mon Mar 01 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4-1
+- imported some macros from redhat-rpm-config.
+
 * Wed Feb 24 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3-1
 - imported some scriptlets from redhat-rpm-config.