Browse Source

updated 5 packages

clamav-0.103.2-1

curl-7.76.0-1

dconf-0.40.0-1

graphene-1.10.6-1

libical-3.0.9-1
Tomohiro "Tomo-p" KATO 3 years ago
parent
commit
a2db2d621b
5 changed files with 164 additions and 137 deletions
  1. 6 12
      c/clamav/clamav-vl.spec
  2. 38 55
      c/curl/curl-vl.spec
  3. 79 33
      d/dconf/dconf-vl.spec
  4. 13 2
      g/graphene/graphene-vl.spec
  5. 28 35
      lib/libi/libical/libical-vl.spec

+ 6 - 12
c/clamav/clamav-vl.spec

@@ -3,18 +3,14 @@
 
 %define dbdir %{_localstatedir}/lib/clamav
 
-%if %{?_dist_release}!="vl5"
 %define milter 1
-%else
-%define milter 0
-%endif
 
 %define pcre_cflags %(pcre-config --cflags)
 
 Summary: Clam AntiVirus
 Summary(ja): Clamアンチウィルススキャナ
 Name: clamav
-Version: 0.103.1
+Version: 0.103.2
 Release: 1%{?_dist_release}%{?with_systemd:.systemd}
 Group: security
 Vendor: Project Vine
@@ -87,9 +83,9 @@ clamav-milter is a milter module to scan mails using Clam AntiVirus.
 
 
 %package devel
-Group: programming
 Summary: headers and libraries for development using Clam AntiVirus
 Summary(ja): Clam AntiVirus を用いた開発に必要なヘッダ・ライブラリ
+Group: programming
 Requires: %{name} = %{version}-%{release}
 Requires: zlib-devel bzip2-devel gmp-devel
 
@@ -133,12 +129,9 @@ CFLAGS="%{pcre_cflags}" \
 %endif
 	--with-dbdir=%{dbdir}
 
-%if %{?_dist_release} == "vl6"
-find . -type f -name 'Makefile' | xargs perl -pi -e 's/-lncurses/-lncurses -ltinfo/'
-%endif
-
 make %{?_smp_mflags}
 
+
 %install
 rm -rf %{buildroot}
 mkdir -p %{buildroot}%{_sysconfdir}/clamd.d
@@ -229,7 +222,6 @@ if ! grep -q '^clamav:' /etc/passwd; then
 fi
 
 %post
-/sbin/ldconfig
 %if %{with systemd}
 %systemd_post clamd.service
 %systemd_post clamav-freshclam.service
@@ -253,7 +245,6 @@ fi
 %endif
 
 %postun
-/sbin/ldconfig
 if [ "$1" = 0 ]; then
     if [ `grep clamav /etc/passwd | wc -l` = 1 ]; then
         /usr/sbin/userdel clamav
@@ -356,6 +347,9 @@ fi
 
 
 %changelog
+* Thu Apr 08 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.103.2-1
+- new upstream release.
+
 * Thu Feb 04 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.103.1-1
 - new upstream release.
 

+ 38 - 55
c/curl/curl-vl.spec

@@ -1,13 +1,9 @@
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
 
-%if %{?_dist_release} != "vl6"
-%global with_http2 1
-%endif
-
 Summary: A utility for getting files from remote servers (FTP, HTTP, and others).
 Summary(ja): リモートサーバ(FTP,HTTPなど)からファイルを取得するためのユーティリティ
 Name: curl 
-Version: 7.75.0
+Version: 7.76.0
 Release: 1%{?_dist_release}
 Group: internet
 Vendor: Project Vine
@@ -18,38 +14,28 @@ License: MIT
 URL: https://curl.haxx.se/
 Source: https://curl.haxx.se/download/%{name}-%{version}.tar.xz
 
-# avoid reporting spurious error in the HTTP2 framing layer (#1690971)
-Patch2:   0002-curl-7.65.3-h2-framing-layer-error.patch
-
 # patch making libcurl multilib ready
 Patch101: 0101-curl-7.73.0-multilib.patch
 
 # prevent configure script from discarding -g in CFLAGS (#496778)
 Patch102: 0102-curl-7.36.0-debug.patch
 
-# migrate tests/http_pipe.py to Python 3
-Patch103: 0103-curl-7.59.0-python3.patch
-
-# use localhost6 instead of ip6-localhost in the curl test-suite
-Patch104: 0104-curl-7.73.0-localhost6.patch
-
 # prevent valgrind from reporting false positives on x86_64
 Patch105: 0105-curl-7.63.0-lib1560-valgrind.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: openssl-devel
+BuildRequires: brotli-devel
 BuildRequires: gnutls-devel
-BuildRequires: libidn-devel zlib-devel
+BuildRequires: libidn2-devel
+BuildRequires: libnghttp2-devel
+BuildRequires: libpsl-devel
+BuildRequires: libssh2-devel
 BuildRequires: openldap-devel
 BuildRequires: openssh-server
 BuildRequires: openssh-clients
+BuildRequires: openssl-devel
 BuildRequires: pkgconfig
-%if "%{?_dist_release}" != "vl6"
-BuildRequires: libssh2-devel
-%endif
-%if 0%{?with_http2}
-BuildRequires: libnghttp2-devel
-%endif
+BuildRequires: zlib-devel
 
 Requires: ca-certificates
 
@@ -79,7 +65,7 @@ use cURL's capabilities internally.
 %package -n compat32-%{name}
 Summary: A utility for getting files from remote servers (FTP, HTTP, and others).
 Summary(ja): リモートサーバ(FTP,HTTPなど)からファイルを取得するためのユーティリティ
-Group: system
+Group: system,legacy
 
 %description -n compat32-%{name}
 cURL is a tool for getting files from FTP, HTTP, Gopher, Telnet, and
@@ -91,7 +77,7 @@ authentication, FTP upload, HTTP post, and file transfer resume.
 
 %package -n compat32-%{name}-devel
 Summary: Files needed for building applications with libcurl.
-Group: programming
+Group: programming,legacy
 
 %description -n compat32-%{name}-devel
 cURL is a tool for getting files from FTP, HTTP, Gopher, Telnet, and
@@ -106,22 +92,7 @@ use cURL's capabilities internally.
 
 %prep
 %setup -q 
-
-# upstream patches
-
-# Fedora patches
-%patch101 -p1
-%patch102 -p1
-#patch103 -p1
-%patch104 -p1
-%patch105 -p1
-
-# make tests/*.py use Python 3
-sed -e '1 s|^#!/.*python|&3|' -i tests/*.py
-
-# regenerate Makefile.in files
-aclocal -I m4
-automake
+%autopatch -p1
 
 # disable test 1112 (#565305), test 1455 (occasionally fails with 'bind failed
 # with errno 98: Address already in use' in Koji environment), and test 1801
@@ -143,23 +114,34 @@ echo "582" >> tests/data/DISABLED
 # adapt test 323 for updated OpenSSL
 sed -e 's/^35$/35,52/' -i tests/data/test323
 
+# use localhost6 instead of ip6-localhost in the curl test-suite
+(
+    # avoid glob expansion in the trace output of `bash -x`
+    { set +x; } 2>/dev/null
+    cmd="sed -e 's|ip6-localhost|localhost6|' -i tests/data/test[0-9]*"
+    printf "+ %s\n" "$cmd" >&2
+    eval "$cmd"
+)
+
+# regenerate the configure script and Makefile.in files
+autoreconf -fiv
+
 
 %build
 %configure \
-  --with-ssl=%{_prefix} \
-  --with-libidn \
+  --disable-static \
+  --enable-hidden-symbols \
   --enable-ipv6 \
+  --enable-ldap \
+  --enable-ldaps \
   --enable-threaded-resolver \
-  --with-ssl --with-ca-bundle=%{_sysconfdir}/pki/tls/certs/ca-bundle.crt \
-%if "%{?_dist_release}" != "vl6"
+  --with-brotli \
+  --with-libidn2 \
+  --with-libpsl \
   --with-libssh2 \
-%endif
-%if 0%{?with_http2}
   --with-nghttp2 \
-%endif
-  --enable-ldaps \
-  --disable-static \
-  --enable-hidden-symbols
+  --with-ssl --with-ca-bundle=%{_sysconfdir}/pki/tls/certs/ca-bundle.crt \
+  %{nil}
 
 make %{?_smp_mflags}
 
@@ -174,9 +156,6 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/lib*.{a,la}
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
-
 
 %files
 %defattr(-,root,root)
@@ -201,7 +180,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 %{_datadir}/aclocal/libcurl.m4
 
-
 ## to build compat32 for x86_64 architecture support
 %if %{build_compat32}
 %files -n compat32-%{name}
@@ -215,6 +193,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Apr 07 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 7.76.0-1
+- new upstream release.
+- dropped ldconfig scriptlets.
+- dropped Patch2, 102-104.
+
 * Sat Feb 20 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 7.75.0-1
 - new upstream release.
 
@@ -241,7 +224,7 @@ rm -rf $RPM_BUILD_ROOT
 * Thu Aug 29 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 7.65.3-1
 - new upstream release.
 - updated patches.
-- imported Patch1, 2 and 105 from rawhide.
+- imported Patch1, 103 and 105 from rawhide.
 
 * Sat Nov 03 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 7.62.0-1
 - new upstream release.

+ 79 - 33
d/dconf/dconf-vl.spec

@@ -1,19 +1,20 @@
+%bcond_with systemd
+
 # Basic Information
 Name:		dconf
-Version:	0.36.0
-Release:	1%{?_dist_release}
-Group:		System Environment/Base
-License:	LGPL
-%global         shortver %(echo %{version} | sed -e 's/\.[0-9]*$//')
-Source0:        https://download.gnome.org/sources/%{name}/%{shortver}/%{name}-%{version}.tar.xz
-BuildRoot:	%{_tmppath}/%{name}-%{version}-root
-
+Summary:	dconf is a low-level configuration system.
+Summary(ja):	dconfは、低レベル設定システムです。
+Version:	0.40.0
+Release:	1%{?_dist_release}%{?with_systemd:.systemd}
+Group:		system
 Vendor:		Project Vine
 Distribution:	Vine Linux
-Packager:	yasumichi, Takemiakduchi
+Packager:	yasumichi
 
-Summary:	dconf is a low-level configuration system.
-Summary(ja):	dconfは、低レベル設定システムです。
+License:	LGPL
+%global         shortver %(echo %{version} | cut -d . -f 1-2)
+Source0:        https://download.gnome.org/sources/%{name}/%{shortver}/%{name}-%{version}.tar.xz
+BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
 # Dependency
 Requires:	dbus
@@ -23,7 +24,7 @@ BuildRequires:	glib2-devel
 BuildRequires:	libxml2-devel
 BuildRequires:	dbus-devel
 BuildRequires:	libxslt-devel
-BuildRequires:	vala-devel
+BuildRequires:	vala
 BuildRequires:	docbook-style-xsl
 BuildRequires:	bash-completion
 BuildRequires:	gtk-doc
@@ -37,10 +38,11 @@ storage systems.
 dconfは、低レベル設定システムです。その主要な目的は、まだ設定保存システムを
 有していないプラットフォーム上にGSettingsのバックエンドを提供することです。
 
-%package    devel
+
+%package	devel
 Summary:	Headers for developing programs that will use %{name}
 Summary(ja):	%{name} の開発用ファイル
-Group:		Development/Libraries
+Group:		programming
 Requires:	%{name} = %{version}-%{release}
 Requires:	glib2-devel
 Requires:	libxml2-devel
@@ -51,57 +53,93 @@ This package contains the headers that programmers will need to develop
 applications which will use %{name}.
 
 
-%package      docs
-Summary:      Documentation for %{name}
-Summary(ja):  %{name} 用のドキュメント
-Group:        Documentation
-BuildArch:    noarch
+%package	docs
+Summary:	Documentation for %{name}
+Summary(ja):	%{name} 用のドキュメント
+Group:		documentation
+BuildArch:	noarch
 
 %description  docs
 This package contains documentation for %{name}.
 
 
-%package      vala
-Summary:      Vala bindings for %{name}
-Summary(ja):  %{name} の Vala バインディング
-Group:        Development/Libraries
-Requires:     %{name} = %{version}-%{release}
-Requires:     vala
+%package	vala
+Summary:	Vala bindings for %{name}
+Summary(ja):	%{name} の Vala バインディング
+Group:		programming
+Requires:	%{name} = %{version}-%{release}
+Requires:	vala
 
 %description  vala
 Vala bindings for %{name}.
 
 
+%debug_package
+
+
 %prep
 %setup -q
 
+
 %build
 %meson -Dgtk_doc=true
 %meson_build
 
 
 %install
-%{__rm} -rf ${RPM_BUILD_ROOT}
+%{__rm} -rf %{buildroot}
 %meson_install
+%if ! %{with systemd}
+rm -rf %{buildroot}/usr/lib/systemd
+%endif
+
+mkdir -p %{buildroot}%{_sysconfdir}/dconf/profile
+cat << EOF > %{buildroot}%{_sysconfdir}/dconf/profile/user
+user-db:user
+system-db:local
+system-db:site
+system-db:distro
+EOF
+
+mkdir -p %{buildroot}%{_sysconfdir}/dconf/db/local.d/locks
+mkdir -p %{buildroot}%{_sysconfdir}/dconf/db/site.d/locks
+mkdir -p %{buildroot}%{_sysconfdir}/dconf/db/distro.d/locks
 
 
 %clean
-%{__rm} -rf ${RPM_BUILD_ROOT}
+%{__rm} -rf %{buildroot}
+
 
+%posttrans
+dconf update ||:
+exit 0
 
+%if %{with systemd}
 %post
-gio-querymodules %{_libdir}/gio/modules
+%systemd_user_post dconf.service
+
+%preun
+%systemd_user_preun dconf.service
 
-%postun 
-if [ $1 -eq 0 ] ; then
-    gio-querymodules %{_libdir}/gio/modules
-fi
+%postun
+%systemd_user_postun_with_restart dconf.service
+%endif
 
 
 %files
 %defattr(-,root,root,-)
 %license COPYING
 %doc NEWS
+%dir %{_sysconfdir}/dconf
+%dir %{_sysconfdir}/dconf/db
+%dir %{_sysconfdir}/dconf/db/local.d
+%dir %{_sysconfdir}/dconf/db/local.d/locks
+%dir %{_sysconfdir}/dconf/db/site.d
+%dir %{_sysconfdir}/dconf/db/site.d/locks
+%dir %{_sysconfdir}/dconf/db/distro.d
+%dir %{_sysconfdir}/dconf/db/distro.d/locks
+%dir %{_sysconfdir}/dconf/profile
+%config(noreplace) %{_sysconfdir}/dconf/profile/user
 %{_bindir}/dconf
 %{_libdir}/gio/modules/libdconfsettings.so
 %{_libdir}/libdconf*.so.*
@@ -113,6 +151,9 @@ fi
 %{_mandir}/man1/dconf.1.gz
 %{_mandir}/man1/dconf-service.1.gz
 %{_mandir}/man7/dconf.7.gz
+%if %{with systemd}
+%{_userunitdir}/*
+%endif
 
 %files devel
 %defattr(-,root,root,-)
@@ -131,8 +172,13 @@ fi
 
 
 %changelog
+* Wed Apr 07 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.40.0-1
+- new upstream release.
+- dropped ldconfig scriptlets.
+- added /etc/dconf structures.
+
 * Wed Mar 18 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.36.0-1
-- new upstream release
+- new upstream release.
 
 * Sun Jul 17 2016 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.26.0-1
 - new upstream release

+ 13 - 2
g/graphene/graphene-vl.spec

@@ -2,8 +2,9 @@
 
 Summary:        Thin layer of types for graphic libraries
 Name:           graphene
-Version:        1.10.2
-Release:        2%{?_dist_release}
+Version:        1.10.6
+Release:        1%{?_dist_release}
+Group:          system
 Vendor:         Project Vine
 Distribution:   Vine Linux
 
@@ -24,15 +25,18 @@ libraries that deal with 2D and 3D transformations and projections.
 
 %package        devel
 Summary:        Development files for %{name}
+Group:          programming
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 
 %description    devel
 The %{name}-devel package contains libraries and header files for
 developing applications that use %{name}.
 
+
 %if %{with tests}
 %package        tests
 Summary:        Tests for the %{name} package
+Group:          programming
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 
 %description    tests
@@ -40,6 +44,10 @@ The %{name}-tests package contains tests that can be used to verify
 the functionality of the installed %{name} package.
 %endif
 
+
+%debug_package
+
+
 %prep
 %autosetup -p1
 
@@ -83,6 +91,9 @@ the functionality of the installed %{name} package.
 
 
 %changelog
+* Wed Apr 07 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.10.6-1
+- new upstream release.
+
 * Mon Aug 03 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.10.2-2
 - initial build for Vine Linux.
 

+ 28 - 35
lib/libi/libical/libical-vl.spec

@@ -2,12 +2,12 @@
 
 Name:		libical
 Summary:	An Open Source implementation of the iCalendar protocols and protocol data units
-Version:	3.0.8
-Release:	2%{?_dist_release}
-Group:		System Environment/Libraries
-Vendor:         Project Vine
-Distribution:   Vine Linux
-Packager:       babasaki, daisuke, inagaki
+Version:	3.0.9
+Release:	1%{?_dist_release}
+Group:		system
+Vendor:		Project Vine
+Distribution:	Vine Linux
+Packager:	babasaki, daisuke, inagaki
 
 License:	LGPLv2 or MPLv1.1
 URL:		https://libical.github.io/libical/
@@ -18,7 +18,7 @@ BuildRequires:	cmake
 BuildRequires:	libxml2-devel
 BuildRequires:	glib2-devel
 BuildRequires:	gobject-introspection-devel
-BuildRequires:	vala-tools
+BuildRequires:	vala
 Requires:	tzdata
 
 #----------------------------------------------------------------------------
@@ -34,7 +34,7 @@ planerach/planistach.
 %package devel
 Summary:	Development files for libical
 Summary(ja):	libical の開発用ファイル
-Group:		Development/Libraries
+Group:		programming
 Requires:	%{name} = %{version}-%{release}
 
 %description devel
@@ -48,7 +48,7 @@ korzystających z libical.
 #----------------------------------------------------------------------------
 %package glib
 Summary:	libical with glib
-Group:		System Environment/Libraries
+Group:		system
 
 %description glib
 this package contains a library to use libical with glib.
@@ -57,7 +57,7 @@ this package contains a library to use libical with glib.
 %package glib-devel
 Summary:	Development files for libical-glib
 Summary(ja):	libical-glib の開発用ファイル
-Group:		Development/Libraries
+Group:		programming
 Requires:	%{name}-devel = %{version}-%{release}
 Requires:	%{name}-glib = %{version}-%{release}
 
@@ -65,48 +65,37 @@ Requires:	%{name}-glib = %{version}-%{release}
 The libical-glib-devel package contains libraries and header files for
 developing applications that use libical-glib.
 
+
+#----------------------------------------------------------------------------
+%debug_package
+
 #----------------------------------------------------------------------------
 %prep
 %setup -q
 
+#----------------------------------------------------------------------------
 %build
-mkdir -p %{_target_platform}
-pushd %{_target_platform}
 %cmake \
     -DCMAKE_BUILD_TYPE=release \
+    -DSHARED_ONLY=true \
+    -DENABLE_GTK_DOC=OFF \
     -DGOBJECT_INTROSPECTION=true \
+    -DUSE_INTEROPERABLE_VTIMEZONES=true \
+    -DICAL_ALLOW_EMPTY_PROPERTIES=true \
     -DICAL_GLIB=true \
     -DICAL_GLIB_VAPI=true \
-    -DENABLE_GTK_DOC=OFF \
-    ..
-popd
-
-make %{?_smp_mflags} -C %{_target_platform}
-
-%check
-# make check
-# Fails on x86_64 and ppc64.
+    %{nil}
+%cmake_build
 
 #----------------------------------------------------------------------------
 %install
 rm -rf $RPM_BUILD_ROOT
+%cmake_install
 
-make install/fast DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}
-
-#make install INSTALL="%{__install} -p" DESTDIR=$RPM_BUILD_ROOT
-#find $RPM_BUILD_ROOT -type f -name "*.la" -delete
-
-rm -f %{buildroot}%{_libdir}/*.a
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+# This is just a private build tool, not meant to be installed
+rm %{buildroot}/%{_libexecdir}/libical/ical-glib-src-generator
 
 #----------------------------------------------------------------------------
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
-
 %files
 %defattr(-,root,root,-)
 %license COPYING LICENSE*
@@ -152,6 +141,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Apr 07 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.0.9-1
+- new upstream release.
+- dropped ldconfig scriptlets.
+
 * Mon Aug 03 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.0.8-2
 - added vala support.