updated 3 packages

glibc-2.31-2

gnome-terminal-3.30.3-1

libsoup-2.70.0-1

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

g/glibc/glibc-vl.spec

@@ -24,6 +24,7 @@
 %define buildpower6 0
 %endif
 %define biarcharches %{ix86} x86_64 ppc ppc64 s390 s390x
+%global _enable_debug_packages 1
 %define debuginfocommonarches %{biarcharches} alpha alphaev6
 %define multiarcharches ppc ppc64 %{ix86} x86_64 %{sparc}
 # Remove -s to get verbose output.
@@ -33,7 +34,7 @@ Summary: The GNU libc libraries
 Summary(ja): GNU libc ライブラリ
 Name: glibc
 Version: %{glibcversion}
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}%{?with_systemd:.systemd}
 # GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries.
 # Things that are linked directly into dynamically linked programs
 # and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional
@@ -57,7 +58,7 @@ Source11: SUPPORTED
 Source1000: rpm-old-changelog.txt
 
 # patched form upstream
-Patch0: glibc-2.31-20200319.patch
+Patch0: glibc-2.31-20200508.patch
 
 # patches from Fedora
 Patch1: glibc-post_upgrade.patch
@@ -389,7 +390,15 @@ Summary(ja): ネームサービスキャッシングデーモン (nscd)
 Group: System Environment/Daemons
 Requires: %{name} = %{version}-%{release}
 Requires: audit-libs >= 1.1.3
-Requires(pre): /sbin/chkconfig, /usr/sbin/useradd, /usr/sbin/userdel, sh-utils
+Requires(pre): /usr/sbin/useradd, coreutils
+Requires(postun): /usr/sbin/userdel
+%if %{with systemd}
+Requires(post): systemd
+Requires(preun): systemd
+Requires(postun): systemd
+%else
+Requires(pre): /sbin/chkconfig
+%endif
 
 %description -n nscd
 Nscd caches name service lookups and can dramatically improve
@@ -833,8 +842,8 @@ install -m 644 nscd/nscd.conf %{glibc_sysroot}/etc
 %if %{with systemd}
 mkdir -p %{glibc_sysroot}%{_tmpfilesdir}
 install -m 644 %{SOURCE4} %{buildroot}%{_tmpfilesdir}
-mkdir -p %{glibc_sysroot}/lib/systemd/system
-install -m 644 nscd/nscd.service nscd/nscd.socket %{glibc_sysroot}/lib/systemd/system
+mkdir -p %{glibc_sysroot}%{_unitdir}
+install -m 644 nscd/nscd.service nscd/nscd.socket %{glibc_sysroot}%{_unitdir}/
 %else
 mkdir -p %{glibc_sysroot}/etc/rc.d/init.d
 install -m 755 nscd/nscd.init %{glibc_sysroot}/etc/rc.d/init.d/nscd
@@ -1159,6 +1168,11 @@ for module in compat files db dns hesiod; do
 done
 grep -e "libmemusage.so" -e "libpcprofile.so" master.filelist >> glibc.filelist
 
+cat glibc.filelist \
+	| grep -v \
+	-e '/sbin/ldconfig' \
+	> compat32-glibc.filelist
+
 ###############################################################################
 # glibc-devel
 ###############################################################################
@@ -1541,6 +1555,7 @@ if posix.access("/etc/ld.so.cache") then
   end
 end
 
+%if %{without systemd}
 %triggerin common -p <lua> -- tzdata
 function update (filename, new_data)
   local fd = io.open(filename)
@@ -1579,6 +1594,7 @@ fd:close()
 if not data then return end
 update("/etc/localtime", data)
 update("/var/spool/postfix/etc/localtime", data)
+%endif
 
 %post common-extra -p <lua>
 -- cp -f /usr/lib/locale/locale-archive-extra.tmpl /usr/lib/locale/locale-archive.tmpl
@@ -1645,21 +1661,33 @@ getent passwd nscd >/dev/null ||
 		    -c "NSCD Daemon" -u 28 -g nscd nscd
 
 %post -n nscd
+%if %{with systemd}
+%systemd_post nscd.service
+%else
 /sbin/chkconfig --add nscd
+%endif
 
 %preun -n nscd
-if [ $1 = 0 ] ; then
+%if %{with systemd}
+%systemd_preun nscd.service
+%else
+if [ $1 = 0 -o -x /bin/systemctl ] ; then
   /sbin/service nscd stop > /dev/null 2>&1
   /sbin/chkconfig --del nscd
 fi
+%endif
 
 %postun -n nscd
 if [ $1 = 0 ] ; then
   /usr/sbin/userdel nscd > /dev/null 2>&1 || :
 fi
+%if %{with systemd}
+%systemd_postun_with_restart nscd.service
+%else
 if [ "$1" -ge "1" ]; then
   service nscd condrestart > /dev/null 2>&1 || :
 fi
+%endif
 
 %if %{xenpackage}
 %post xen -p /sbin/ldconfig
@@ -1672,9 +1700,12 @@ rm -f *.filelist*
 
 %files -f glibc.filelist
 %defattr(-,root,root)
+/sbin/ldconfig
 /%{_lib}/libnsl.so.*
 %dir %{_prefix}/%{_lib}/audit
-%if %{without systemd}
+%if %{with systemd}
+%exclude /etc/localtime
+%else
 %verify(not md5 size mtime) %config(noreplace) /etc/localtime
 %endif
 %verify(not md5 size mtime) %config(noreplace) /etc/nsswitch.conf
@@ -1694,7 +1725,7 @@ rm -f *.filelist*
 %license COPYING COPYING.LIB LICENSES
 
 %if %{build_compat32}
-%files -f glibc.filelist -n compat32-%{name}
+%files -f compat32-glibc.filelist -n compat32-%{name}
 /%{_lib}/libnsl.so.*
 %endif
 
@@ -1750,7 +1781,10 @@ rm -f *.filelist*
 %files -f nscd.filelist -n nscd
 %defattr(-,root,root)
 %config(noreplace) /etc/nscd.conf
-%if %{without systemd}
+%if %{with systemd}
+%{_unitdir}/*
+%{_tmpfilesdir}/*
+%else
 %config /etc/rc.d/init.d/nscd
 %endif
 %dir %attr(0755,root,root) /var/run/nscd
@@ -1780,6 +1814,11 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Sat May 09 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.31-2
+- updated Patch0.
+- added systemd support (disabled as default).
+- dropped /sbin/ldconfig from compat32.
+
 * Thu Mar 19 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.31-1
 - updated to 2.31.
 - updated Patch0.

g/gnome-terminal/gnome-terminal-vl.spec

@@ -6,49 +6,48 @@
 %define startup_notification_version 0.8
 %define desktop_file_utils_version 0.10
 
-Summary: GNOME Terminal
-Summary(ja): GNOME ターミナル
-Name: gnome-terminal
-Version: 3.20.2
-Release: 1%{?_dist_release}
-URL: http://www.gnome.org
-Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name}/3.20/%{name}-%{version}.tar.xz
-
-License: GPL 
-Group: User Interface/Desktops
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
-
-Requires: vte3 >= %{vte3_version}
-Obsoletes: gnome-terminal2
-
-BuildRequires: gnome-shell
-BuildRequires: glib2-devel >= %{glib2_version}
-BuildRequires: gtk3-devel >= %{gtk3_version}
-BuildRequires: vte3-devel >= %{vte3_version}
-BuildRequires: dbus-glib-devel
-BuildRequires: startup-notification-devel >= %{startup_notification_version}
-BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
-BuildRequires: libSM-devel
-BuildRequires: dconf-devel
-BuildRequires: libuuid-devel
-BuildRequires: docbook-utils
-BuildRequires: gsettings-desktop-schemas-devel
-BuildRequires: gnome-doc-utils
-BuildRequires: itstool
-BuildRequires: appdata-tools
-BuildRequires: vala-devel
-BuildRequires: GConf2-devel
-
-Vendor: Project Vine
-Distribution: Vine Linux
-Packager: Takemikaduchi
+Name:           gnome-terminal
+Summary:        GNOME Terminal
+Summary(ja):    GNOME ターミナル
+Version:        3.30.3
+Release:        1%{?_dist_release}
+Group:          User Interface/Desktops
+Vendor:         Project Vine
+Distribution:   Vine Linux
+
+License:        GPL 
+URL:            http://www.gnome.org
+%global         shortver %(echo %{version} | cut -d . -f 1,2)
+Source:         https://download.gnome.org/sources/%{name}/%{shortver}/%{name}-%{version}.tar.xz
+
+BuildRoot:      %{_tmppath}/%{name}-%{version}-root
+
+Requires:       vte3 >= %{vte3_version}
+Obsoletes:      gnome-terminal2
+
+BuildRequires:  gnome-shell
+BuildRequires:  glib2-devel >= %{glib2_version}
+BuildRequires:  gtk3-devel >= %{gtk3_version}
+BuildRequires:  vte3-devel >= %{vte3_version}
+BuildRequires:  dbus-glib-devel
+BuildRequires:  startup-notification-devel >= %{startup_notification_version}
+BuildRequires:  desktop-file-utils >= %{desktop_file_utils_version}
+BuildRequires:  libSM-devel
+BuildRequires:  dconf-devel
+BuildRequires:  libuuid-devel
+BuildRequires:  docbook-utils
+BuildRequires:  gsettings-desktop-schemas-devel
+BuildRequires:  gnome-doc-utils
+BuildRequires:  itstool
+BuildRequires:  libappstream-glib
+BuildRequires:  vala-devel
+BuildRequires:  GConf2-devel
+BuildRequires:  pcre2-devel
 
 %description
-
 GNOME terminal emulator application.
 
 %description -l ja
-
 GNOME 端末エミュレータです。
 
 %prep
@@ -91,17 +90,20 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 
 %files -f %{gettext_package}.lang
 %defattr(-,root,root)
-%doc AUTHORS COPYING ChangeLog NEWS
+%license COPYING
+%doc AUTHORS ChangeLog NEWS
 %{_bindir}/%{name}
-%{_libexecdir}/%{name}-migration
 %{_libexecdir}/%{name}-server
-%{_datadir}/appdata/org.gnome.Terminal.appdata.xml
+%{_datadir}/metainfo/org.gnome.Terminal.appdata.xml
 %{_datadir}/applications/gnome-org.gnome.Terminal.desktop
 %{_datadir}/dbus-1/services/org.gnome.Terminal.service
 %{_datadir}/glib-2.0/schemas/org.gnome.Terminal.gschema.xml
 %{_datadir}/gnome-shell/search-providers/gnome-terminal-search-provider.ini
 
 %changelog
+* Sat May 09 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.30.3-1
+- new upstream release.
+
 * Mon Jul 18 2016 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.20.2-1
 - new upstream release
 

lib/libs/libsoup/libsoup-vl.spec

@@ -4,12 +4,17 @@
 Summary: Soup, an HTTP library implementation
 Summary(ja): Soup - HTTP ライブラリ実装
 Name: libsoup
-Version: 2.61.1
+Version: 2.70.0
 Release: 1%{?_dist_release}
-License: LGPL
 Group: System Environment/Libraries
-Source0: ftp://ftp.gnome.org/pub/gnome/sources/%{name}/2.54/%{name}-%{version}.tar.xz
+Vendor: Project Vine
+Distribution: Vine Linux
+
+License: LGPL
+%global shortver %(echo %{version} | cut -d . -f 1,2)
 URL: ftp://ftp.gnome.org/pub/gnome/sources/libsoup/
+Source: https://download.gnome.org/sources/%{name}/%{shortver}/%{name}-%{version}.tar.xz
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: glib2-devel >= 2.26.0
 BuildRequires: gnutls-devel, libxml2-devel, pkgconfig
@@ -20,16 +25,16 @@ BuildRequires: gobject-introspection-devel
 BuildRequires: vala-devel
 BuildRequires: vala-tools
 BuildRequires: python3
+BuildRequires: meson
+BuildRequires: brotli-devel
+BuildRequires: libpsl-devel
 
-BuildRequires: mod_ssl-apache2
+#BuildRequires: mod_ssl-apache2
 BuildRequires: curl
 BuildRequires: glib-networking
 
 Requires: glib-networking
 
-Vendor: Project Vine
-Distribution: Vine Linux
-
 %description
 Libsoup is an HTTP library implementation in C. It was originally part
 of a SOAP (Simple Object Access Protocol) implementation called Soup, but
@@ -87,20 +92,25 @@ supported for those who want it).
 %prep
 %setup -q
 
+
 %build
-%configure \
-	--disable-static \
-	--enable-introspection=yes
-make %{?_smp_mflags}
+%meson \
+  -Dgssapi=disabled \
+  -Dntlm=disabled
+%meson_build
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-
-find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \;
+%meson_install
 
 %find_lang %{name}
 
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
 %post -p /sbin/ldconfig 
 
 %postun -p /sbin/ldconfig
@@ -109,12 +119,11 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \;
 
 %postun -n compat32-%{name} -p /sbin/ldconfig
 
-%clean
-rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(-, root, root)
-%doc README COPYING NEWS AUTHORS 
+%license COPYING
+%doc README NEWS AUTHORS 
 %{_libdir}/lib*.so.*
 %{_libdir}/girepository-1.0
 
@@ -124,7 +133,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/libsoup-gnome-2.4
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*.pc
-%{_datadir}/gtk-doc/html/libsoup-2.4
+#%{_datadir}/gtk-doc/html/libsoup-2.4
 %{_datadir}/gir-1.0
 
 %files vala
@@ -140,6 +149,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat May 09 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.70.0-1
+- new upstream release.
+
 * Sat Jan 06 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.61.1-1
 - new upstream release.