updated 4 packages

ethtool-5.10-1

lcms2-2.12-1

squid-4.14-1

webkitgtk4-2.30.5-1

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

e/ethtool/ethtool-vl.spec

@@ -4,8 +4,8 @@
 Summary:        A tool for setting ethernet parameters
 Summary(ja):    Ethernet コントローラ設定ツール
 Name:           ethtool
-Epoch:	          1
-Version:        5.8
+Epoch:          1
+Version:        5.10
 Release:        1%{?_dist_release}
 Group:          admin-tools,network
 Vendor:         Project Vine
@@ -34,6 +34,9 @@ Ethtool は ethernet コントローラの各種設定値を取得したり，
 開発者に問い合わせてみて下さい．
 
 
+%debug_package
+
+
 %prep
 %setup -q
 
@@ -68,6 +71,9 @@ rm -rf ${RPM_BUILD_ROOT}
 
 
 %changelog
+* Tue Mar 02 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1:5.10-1
+- new upstream release.
+
 * Sun Sep 06 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1:5.8-1
 - new upstream release.
 

l/lcms2/lcms2-vl.spec

@@ -3,9 +3,9 @@
 Name:           lcms2
 Summary:        Color Management Engine
 Summary(ja):    カラーマネージメントエンジン
-Version:        2.9
-Release:        2%{?_dist_release}
-Group:          System Environment/Libraries
+Version:        2.12
+Release:        1%{?_dist_release}
+Group:          system
 Vendor:         Project Vine
 Distribution:   Vine Linux
 
@@ -18,23 +18,24 @@ BuildRequires:  libjpeg-devel
 BuildRequires:  libtiff-devel
 BuildRequires:  zlib-devel
 
-
 %description
 LittleCMS intends to be a small-footprint, speed optimized color management
 engine in open source form. LCMS2 is the current version of LCMS, and can be
 parallel installed with the original (deprecated) lcms.
 
+
 %package        utils
 Summary:        Utility applications for %{name}
-Group:          Applications/Productivity
+Group:          graphics
 
 %description    utils
 The %{name}-utils package contains utility applications for %{name}.
 
+
 %package        devel
 Summary:        Development files for LittleCMS
 Summary(ja):    LittleCMS の開発用ファイル
-Group:          Development/Libraries
+Group:          programming
 Requires:       %{name} = %{version}-%{release}
 Provides:       littlecms-devel = %{version}-%{release}
 
@@ -46,9 +47,10 @@ Development files for LittleCMS.
 %package -n 	compat32-%{name}
 Summary:	Color Management Engine
 Summary(ja):    カラーマネージメントエンジン
-Group:		System Environment/Libraries
+Group:		system
 Requires:	%{name} = %{version}-%{release}
 
+
 %description -n	compat32-%{name}
 LittleCMS intends to be a small-footprint, speed optimized color management
 engine in open source form. LCMS2 is the current version of LCMS, and can be
@@ -57,7 +59,7 @@ parallel installed with the original (deprecated) lcms.
 %package -n	compat32-%{name}-devel
 Summary:        Development files for LittleCMS
 Summary(ja):    LittleCMS の開発用ファイル
-Group:          Development/Libraries
+Group:          programming
 Requires:       compat32-%{name} = %{version}-%{release}
 Requires:       %{name}-devel = %{version}-%{release}
 
@@ -65,9 +67,12 @@ Requires:       %{name}-devel = %{version}-%{release}
 Development files for LittleCMS.
 
 
+%debug_package
+
 
 %prep
-%setup -q
+%setup -q -n Little-CMS-lcms%{version}
+
 
 %build
 %configure --disable-static --program-suffix=2
@@ -78,6 +83,7 @@ sed -i.rpath 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 
 make %{?_smp_mflags}
 
+
 %install
 rm -rf ${RPM_BUILD_ROOT}
 make install DESTDIR=${RPM_BUILD_ROOT} INSTALL="install -p"
@@ -89,9 +95,9 @@ install -D -m 644 include/lcms2_plugin.h $RPM_BUILD_ROOT/usr/include/lcms2_plugi
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
-%post -p /sbin/ldconfig
 
-%postun -p /sbin/ldconfig
+%ldconfig_scriptlets
+
 
 %files
 %defattr(-,root,root,-)
@@ -123,6 +129,9 @@ rm -rf ${RPM_BUILD_ROOT}
 
 
 %changelog
+* Tue Mar 02 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 2.12-1
+- new upstream release.
+
 * Mon May 04 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 2.9-2
 - rebuilt with current environment.
 

s/squid/squid-vl.spec

@@ -1,9 +1,5 @@
 %bcond_with     systemd
 
-%define         base_name       squid
-%define         pkg_epoch       7
-%define         pkg_version     4.13
-%define         pkg_release     1%{?_dist_release}%{?with_systemd:.systemd}
 %define         uid             23
 %define         gid             23
 
@@ -11,29 +7,29 @@
 
 Summary:        The Squid proxy caching server
 Summary(ja):    Squid ウェブプロキシキャッシュ
-Name:           %{base_name}
-Epoch:          %{pkg_epoch}
-Version:        %{pkg_version}
-Release:        %{pkg_release}
+Name:           squid
+Epoch:          7
+Version:        4.14
+Release:        1%{?_dist_release}%{?with_systemd:.systemd}
 Group:          servers
 Vendor:         Project Vine
 Distribution:   Vine Linux
 
 License:        GPLv2+
 URL:            http://www.squid-cache.org
-Source0:        http://www.squid-cache.org/Versions/v4/%{base_name}-%{version}.tar.xz
-Source1:        %{base_name}.init
-Source2:        %{base_name}.logrotate
-Source3:        %{base_name}.sysconfig
-Source4:        %{base_name}.pam
-Source5:        %{base_name}.service
+Source0:        http://www.squid-cache.org/Versions/v4/%{name}-%{version}.tar.xz
+Source1:        %{name}.init
+Source2:        %{name}.logrotate
+Source3:        %{name}.sysconfig
+Source4:        %{name}.pam
+Source5:        %{name}.service
 Source6:        cache_swap.sh
 
 Patch1:         0001-config.patch
 Patch2:         0002-location.patch
 Patch3:         0003-perlpath.patch
 
-BuildRoot:      %{_tmppath}/%{base_name}-%{version}-root
+BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 BuildRequires:  openldap-devel pam-devel openssl-devel krb5-devel
 BuildRequires:  cyrus-sasl-devel libcap-devel libdb-devel
 Requires:       bash >= 2.0
@@ -91,10 +87,10 @@ CFLAGS="$RPM_OPT_FLAGS -fPIC -Wno-cpp"
 LDFLAGS="$RPM_LD_FLAGS -pie -Wl,-z,relro -Wl,-z,now -Wl,--warn-shared-textrel"
 
 %configure \
-   --libexecdir=%{_libdir}/%{base_name} \
-   --datadir=%{_datadir}/%{base_name} \
-   --sysconfdir=%{_sysconfdir}/%{base_name} \
-   --with-logdir=%{_localstatedir}/log/%{base_name} \
+   --libexecdir=%{_libdir}/%{name} \
+   --datadir=%{_datadir}/%{name} \
+   --sysconfdir=%{_sysconfdir}/%{name} \
+   --with-logdir=%{_localstatedir}/log/%{name} \
    --disable-dependency-tracking \
    --enable-eui \
    --enable-follow-x-forwarded-for \
@@ -126,7 +122,7 @@ LDFLAGS="$RPM_LD_FLAGS -pie -Wl,-z,relro -Wl,-z,now -Wl,--warn-shared-textrel"
    --enable-wccpv2 \
    --enable-internal-dns \
    --with-aio \
-   --with-default-user="%{base_name}" \
+   --with-default-user="%{name}" \
    --with-filedescriptors=16384 \
    --with-dl \
    --with-openssl \
@@ -139,7 +135,7 @@ LDFLAGS="$RPM_LD_FLAGS -pie -Wl,-z,relro -Wl,-z,now -Wl,--warn-shared-textrel"
 
 %{__make} \
     %{?_smp_mflags} \
-    DEFAULT_SWAP_DIR="%{_localstatedir}/cache/%{base_name}"
+    DEFAULT_SWAP_DIR="%{_localstatedir}/cache/%{name}"
 
 
 %install
@@ -147,14 +143,14 @@ LDFLAGS="$RPM_LD_FLAGS -pie -Wl,-z,relro -Wl,-z,now -Wl,--warn-shared-textrel"
 
 %{__make} install \
     DESTDIR="${RPM_BUILD_ROOT}" \
-    DEFAULT_SWAP_DIR="%{_localstatedir}/cache/%{base_name}"
+    DEFAULT_SWAP_DIR="%{_localstatedir}/cache/%{name}"
 
 echo "
 #
-# This is %{_sysconfdir}/httpd/conf.d/%{base_name}.conf
+# This is %{_sysconfdir}/httpd/conf.d/%{name}.conf
 #
 
-ScriptAlias /Squid/cgi-bin/cachemgr.cgi %{_libdir}/%{base_name}/cachemgr.cgi
+ScriptAlias /Squid/cgi-bin/cachemgr.cgi %{_libdir}/%{name}/cachemgr.cgi
 
 # Only allow access from localhost by default
 <Location /Squid/cgi-bin/cachemgr.cgi>
@@ -162,7 +158,7 @@ ScriptAlias /Squid/cgi-bin/cachemgr.cgi %{_libdir}/%{base_name}/cachemgr.cgi
  allow from localhost.localdomain
  # Add additional allowed hosts as needed
  # allow from .example.com
-</Location>" > ${RPM_BUILD_ROOT}/%{base_name}.httpd.tmp
+</Location>" > ${RPM_BUILD_ROOT}/%{name}.httpd.tmp
 
 mkdir -p ${RPM_BUILD_ROOT}%{_initdir}
 mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d
@@ -174,20 +170,20 @@ mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/httpd/conf.d/
 install -Dpm644 %{SOURCE5} ${RPM_BUILD_ROOT}%{_unitdir}/%{name}.service
 install -Dpm755 %{SOURCE6} ${RPM_BUILD_ROOT}%{_libexecdir}/%{name}/cache_swap.sh
 %else
-install -m 755 %{SOURCE1} ${RPM_BUILD_ROOT}%{_initdir}/%{base_name}
+install -m 755 %{SOURCE1} ${RPM_BUILD_ROOT}%{_initdir}/%{name}
 %endif
-install -m 644 %{SOURCE2} ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/%{base_name}
-install -m 644 %{SOURCE3} ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/%{base_name}
-install -m 644 %{SOURCE4} ${RPM_BUILD_ROOT}%{_sysconfdir}/pam.d/%{base_name}
-install -m 644 ${RPM_BUILD_ROOT}/%{base_name}.httpd.tmp ${RPM_BUILD_ROOT}%{_sysconfdir}/httpd/conf.d/%{base_name}.conf
-mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/log/%{base_name}
-mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/cache/%{base_name}
+install -m 644 %{SOURCE2} ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/%{name}
+install -m 644 %{SOURCE3} ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/%{name}
+install -m 644 %{SOURCE4} ${RPM_BUILD_ROOT}%{_sysconfdir}/pam.d/%{name}
+install -m 644 ${RPM_BUILD_ROOT}/%{name}.httpd.tmp ${RPM_BUILD_ROOT}%{_sysconfdir}/httpd/conf.d/%{name}.conf
+mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/log/%{name}
+mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/cache/%{name}
 chmod 644 contrib/url-normalizer.pl contrib/user-agents.pl
 iconv -f ISO88591 -t UTF8 ChangeLog -o ChangeLog.tmp
 mv -f ChangeLog.tmp ChangeLog
 
 # remove unpackaged files from the buildroot
-rm -f ${RPM_BUILD_ROOT}/%{base_name}.httpd.tmp
+rm -f ${RPM_BUILD_ROOT}/%{name}.httpd.tmp
 
 
 %clean
@@ -202,18 +198,18 @@ for l in zh-cn zh-tw; do
 done
 
 %pre
-if ! getent group %{base_name} >/dev/null 2>&1; then
-  /usr/sbin/groupadd -g %{gid} %{base_name}
+if ! getent group %{name} >/dev/null 2>&1; then
+  /usr/sbin/groupadd -g %{gid} %{name}
 fi
 
-if ! getent passwd %{base_name} >/dev/null 2>&1 ; then
-  /usr/sbin/useradd -g %{gid} -u %{uid} -d %{_localstatedir}/cache/%{base_name} -r -s /sbin/nologin %{base_name} >/dev/null 2>&1 || exit 1 
+if ! getent passwd %{name} >/dev/null 2>&1 ; then
+  /usr/sbin/useradd -g %{gid} -u %{uid} -d %{_localstatedir}/cache/%{name} -r -s /sbin/nologin %{name} >/dev/null 2>&1 || exit 1 
 fi
 
-for i in %{_localstatedir}/log/%{base_name} %{_localstatedir}/cache/%{base_name} ; do
+for i in %{_localstatedir}/log/%{name} %{_localstatedir}/cache/%{name} ; do
         if [ -d $i ] ; then
-                for adir in `find $i -maxdepth 0 \! -user %{base_name}`; do
-                        chown -R %{base_name}:%{base_name} $adir
+                for adir in `find $i -maxdepth 0 \! -user %{name}`; do
+                        chown -R %{name}:%{name} $adir
                 done
         fi
 done
@@ -224,8 +220,8 @@ exit 0
 %if %{with systemd}
 %systemd_post %{name}.service
 %else
-if ! /sbin/chkconfig %{base_name}; then
-  /sbin/chkconfig --add %{base_name}
+if ! /sbin/chkconfig %{name}; then
+  /sbin/chkconfig --add %{name}
 fi
 %endif
 
@@ -234,9 +230,9 @@ fi
 %systemd_preun %{name}.service
 %else
 if [ "$1" -eq "0" -o -x /bin/systemctl ]; then
-  %{_initdir}/%{base_name} stop
-  rm -f %{_localstatedir}/log/%{base_name}/*
-  /sbin/chkconfig --del %{base_name}
+  %{_initdir}/%{name} stop
+  rm -f %{_localstatedir}/log/%{name}/*
+  /sbin/chkconfig --del %{name}
 fi
 %endif
 
@@ -245,69 +241,69 @@ fi
 %systemd_postun_with_restart %{name}.service
 %else
 if [ "$1" -gt 1 ]; then
-  %{_initdir}/%{base_name} condrestart
+  %{_initdir}/%{name} condrestart
 fi
 %endif
 
 %triggerin -- samba-common
-/usr/sbin/usermod -a -G wbpriv %{base_name} >/dev/null 2>&1 || \
-    chgrp %{base_name} %{_localstatedir}/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
+/usr/sbin/usermod -a -G wbpriv %{name} >/dev/null 2>&1 || \
+    chgrp %{name} %{_localstatedir}/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
 
 
 %files
 %defattr(-,root,root,-)
 # Directory
-%dir %{_sysconfdir}/%{base_name}/
-%dir %{_libdir}/%{base_name}
-%dir %{_datadir}/%{base_name}
-%attr(0750,%{base_name},%{base_name}) %dir %{_localstatedir}/log/%{base_name}
-%attr(0750,%{base_name},%{base_name}) %dir %{_localstatedir}/cache/%{base_name}
+%dir %{_sysconfdir}/%{name}/
+%dir %{_libdir}/%{name}
+%dir %{_datadir}/%{name}
+%attr(0750,%{name},%{name}) %dir %{_localstatedir}/log/%{name}
+%attr(0750,%{name},%{name}) %dir %{_localstatedir}/cache/%{name}
 # Program Files
-%attr(0755,root,root) %{_sbindir}/%{base_name}
+%attr(0755,root,root) %{_sbindir}/%{name}
 %attr(0755,root,root) %{_bindir}/*
-%attr(0755,root,root) %{_libdir}/%{base_name}/cachemgr.cgi
-%attr(4750,root,%{base_name}) %{_libdir}/%{base_name}/basic_*
-%attr(4750,root,%{base_name}) %{_libdir}/%{base_name}/digest_*
-%attr(4750,root,%{base_name}) %{_libdir}/%{base_name}/diskd
-%attr(4750,root,%{base_name}) %{_libdir}/%{base_name}/ext_*
-%attr(4750,root,%{base_name}) %{_libdir}/%{base_name}/helper*
-%attr(4750,root,%{base_name}) %{_libdir}/%{base_name}/log_*
-%attr(4750,root,%{base_name}) %{_libdir}/%{base_name}/negotiate_*
-%attr(4750,root,%{base_name}) %{_libdir}/%{base_name}/ntlm_*
-%attr(4750,root,%{base_name}) %{_libdir}/%{base_name}/security_*
-%attr(4750,root,%{base_name}) %{_libdir}/%{base_name}/storeid_*
-%attr(4750,root,%{base_name}) %{_libdir}/%{base_name}/unlinkd
-%attr(4750,root,%{base_name}) %{_libdir}/%{base_name}/url_*
+%attr(0755,root,root) %{_libdir}/%{name}/cachemgr.cgi
+%attr(4750,root,%{name}) %{_libdir}/%{name}/basic_*
+%attr(4750,root,%{name}) %{_libdir}/%{name}/digest_*
+%attr(4750,root,%{name}) %{_libdir}/%{name}/diskd
+%attr(4750,root,%{name}) %{_libdir}/%{name}/ext_*
+%attr(4750,root,%{name}) %{_libdir}/%{name}/helper*
+%attr(4750,root,%{name}) %{_libdir}/%{name}/log_*
+%attr(4750,root,%{name}) %{_libdir}/%{name}/negotiate_*
+%attr(4750,root,%{name}) %{_libdir}/%{name}/ntlm_*
+%attr(4750,root,%{name}) %{_libdir}/%{name}/security_*
+%attr(4750,root,%{name}) %{_libdir}/%{name}/storeid_*
+%attr(4750,root,%{name}) %{_libdir}/%{name}/unlinkd
+%attr(4750,root,%{name}) %{_libdir}/%{name}/url_*
 # Config Files
 %if %{with systemd}
-%attr(0644,root,root) %{_unitdir}/%{base_name}.service
-%dir %{_libexecdir}/%{base_name}
-%attr(0755,root,root) %{_libexecdir}/%{base_name}/*
+%attr(0644,root,root) %{_unitdir}/%{name}.service
+%dir %{_libexecdir}/%{name}
+%attr(0755,root,root) %{_libexecdir}/%{name}/*
 %else
-%attr(0755,root,root) %{_initdir}/%{base_name}
+%attr(0755,root,root) %{_initdir}/%{name}
 %endif
-%attr(0640,root,%{base_name}) %config(noreplace) %{_sysconfdir}/%{base_name}/%{base_name}.conf
-%attr(0644,root,%{base_name}) %config(noreplace) %{_sysconfdir}/%{base_name}/cachemgr.conf
-%config(noreplace) %{_sysconfdir}/%{base_name}/mime.conf
-%config(noreplace) %{_sysconfdir}/%{base_name}/errorpage.css
-%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/httpd/conf.d/%{base_name}.conf
-%config(noreplace) %{_sysconfdir}/sysconfig/%{base_name}
-%config(noreplace) %{_sysconfdir}/pam.d/%{base_name}
-%config(noreplace) %{_sysconfdir}/logrotate.d/%{base_name}
+%attr(0640,root,%{name}) %config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
+%attr(0644,root,%{name}) %config(noreplace) %{_sysconfdir}/%{name}/cachemgr.conf
+%config(noreplace) %{_sysconfdir}/%{name}/mime.conf
+%config(noreplace) %{_sysconfdir}/%{name}/errorpage.css
+%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf
+%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
+%config(noreplace) %{_sysconfdir}/pam.d/%{name}
+%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 # Sample Config Files
-%config %{_sysconfdir}/%{base_name}/%{base_name}.conf.default
-%config %{_sysconfdir}/%{base_name}/cachemgr.conf.default
-%config %{_sysconfdir}/%{base_name}/mime.conf.default
-%config %{_sysconfdir}/%{base_name}/errorpage.css.default
+%config %{_sysconfdir}/%{name}/%{name}.conf.default
+%config %{_sysconfdir}/%{name}/cachemgr.conf.default
+%config %{_sysconfdir}/%{name}/mime.conf.default
+%config %{_sysconfdir}/%{name}/errorpage.css.default
 # Data Files
-%{_datadir}/%{base_name}/*
+%{_datadir}/%{name}/*
 # Document Files
 %license COPYING
 %doc README ChangeLog QUICKSTART
 %doc contrib/url-normalizer.pl contrib/user-agents.pl
 %{_mandir}/man8/*
 %{_mandir}/man1/*
-%{_sysconfdir}/%{base_name}/%{base_name}.conf.documented
+%{_sysconfdir}/%{name}/%{name}.conf.documented
 
 
 %changelog

w/webkitgtk4/webkitgtk4-vl.spec

@@ -10,7 +10,7 @@
 
 Summary:        GTK+ Web content engine library
 Name:           webkitgtk4
-Version:        2.30.3
+Version:        2.30.5
 Release:        1%{?_dist_release}%{?with_systemd:.systemd}
 Group:          system
 Vendor:         Project Vine
@@ -145,9 +145,6 @@ rm -rf Source/ThirdParty/qunit/
 %global optflags  %{optflags} -DENABLE_YARR_JIT=0
 %endif
 
-mkdir -p %{_target_platform}
-pushd %{_target_platform}
-
 %if %{with clang}
 export CC=clang
 export CXX=clang++
@@ -173,13 +170,12 @@ export LD=ld.lld
   -DUSE_SYSTEMD=OFF \
 %endif
   ..
-popd
 
-ninja -C %{_target_platform}
+ninja -C %{_vpath_builddir}
 
 
 %install
-DESTDIR=%{buildroot} ninja -C %{_target_platform} install
+DESTDIR=%{buildroot} ninja -C %{_vpath_builddir} install
 
 %find_lang WebKit2GTK-4.0
 
@@ -238,6 +234,9 @@ DESTDIR=%{buildroot} ninja -C %{_target_platform} install
 
 
 %changelog
+* Tue Mar 02 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 2.30.5-1
+- new upstream release.
+
 * Tue Dec 08 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 2.30.3-1
 - new upstream release.
 - added systemd support (disabled as default).