Browse Source

updated 4 packages

NetworkManager-1.26.0-1

brotli-1.0.7-4

libseccomp-2.5.0-1

woff2-1.0.2-6

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@12449 ec354946-7b23-47d6-9f5a-488ba84defc7
tomop 3 years ago
parent
commit
66f9bc71a8

+ 22 - 5
N/NetworkManager/NetworkManager-vl.spec

@@ -20,13 +20,13 @@
 %define ppp_version 2.4.8
 %define ppp_version 2.4.8
 %define mm_version 1.10.4
 %define mm_version 1.10.4
 
 
+%global systemd_units NetworkManager.service NetworkManager-wait-online.service NetworkManager-dispatcher.service
+
 Name: NetworkManager
 Name: NetworkManager
 Summary: Network connection manager and user applications
 Summary: Network connection manager and user applications
 Summary(ja): ネットワーク接続マネージャとユーザアプリケーション
 Summary(ja): ネットワーク接続マネージャとユーザアプリケーション
-Version: 1.22.10
+Version: 1.26.0
 Release: 1%{?_dist_release}%{?with_systemd:.systemd}
 Release: 1%{?_dist_release}%{?with_systemd:.systemd}
-Group: System Environment/Base
-
 Vendor: Project Vine
 Vendor: Project Vine
 Distribution: Vine Linux
 Distribution: Vine Linux
 
 
@@ -40,8 +40,12 @@ Source1000: NetworkManager.init
 
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 
-Requires(post): chkconfig
-Requires(preun): chkconfig
+%if %{with systemd}
+%{?systemd_requires}
+%else
+Requires(post): chkconfig /sbin/service
+Requires(preun): chkconfig /sbin/service
+%endif
 Requires(posttrans): util-linux
 Requires(posttrans): util-linux
 
 
 Requires: iproute openssl
 Requires: iproute openssl
@@ -188,6 +192,7 @@ by nm-connection-editor and nm-applet in a non-graphical environment.
 %if !%{with systemd}
 %if !%{with systemd}
 %endif
 %endif
 
 
+
 %build
 %build
 NOCONFIGURE=1 ./autogen.sh
 NOCONFIGURE=1 ./autogen.sh
 sed -i "s|redhat-release|vine-release|g" configure
 sed -i "s|redhat-release|vine-release|g" configure
@@ -226,6 +231,7 @@ sed -i "s|redhat-release|vine-release|g" configure
 
 
 make %{?_smp_mflags}
 make %{?_smp_mflags}
 
 
+
 %install
 %install
 %{__rm} -rf %{buildroot}
 %{__rm} -rf %{buildroot}
 
 
@@ -265,6 +271,7 @@ rm -f %{buildroot}%{_libdir}/gnome-bluetooth/plugins/libnma.so
 %clean
 %clean
 rm -rf %{buildroot}
 rm -rf %{buildroot}
 
 
+
 %if %{with systemd}
 %if %{with systemd}
 %pre
 %pre
 if [ -f "%{systemd_dir}/network-online.target.wants/NetworkManager-wait-online.service" ] ; then
 if [ -f "%{systemd_dir}/network-online.target.wants/NetworkManager-wait-online.service" ] ; then
@@ -379,8 +386,12 @@ done
 %{systemd_dir}/*
 %{systemd_dir}/*
 %{nm_confdir}/dispatcher.d/90-nm-cloud-setup.sh
 %{nm_confdir}/dispatcher.d/90-nm-cloud-setup.sh
 %{nm_confdir}/dispatcher.d/no-wait.d/90-nm-cloud-setup.sh
 %{nm_confdir}/dispatcher.d/no-wait.d/90-nm-cloud-setup.sh
+%dir /usr/lib/firewalld
+%dir /usr/lib/firewalld/zones
+/usr/lib/firewalld/zones/nm-shared.xml
 %else
 %else
 %config %{_sysconfdir}/rc.d/init.d/NetworkManager
 %config %{_sysconfdir}/rc.d/init.d/NetworkManager
+%exclude /usr/lib/firewalld/zones/nm-shared.xml
 %endif
 %endif
 %config(noreplace) %{_sysconfdir}/%{name}/nm-system-settings.conf
 %config(noreplace) %{_sysconfdir}/%{name}/nm-system-settings.conf
 %config(noreplace) %{_sysconfdir}/%{name}/conf.d/00-server.conf
 %config(noreplace) %{_sysconfdir}/%{name}/conf.d/00-server.conf
@@ -476,6 +487,12 @@ done
 
 
 
 
 %changelog
 %changelog
+* Mon Aug 03 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.26.0-1
+- new upstream release.
+
+* Fri Apr 17 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.22.10-2
+- fixed systemd stuff.
+
 * Wed Apr 01 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.22.10-1
 * Wed Apr 01 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.22.10-1
 - new upstream release.
 - new upstream release.
 - built with ppp-2.4.8.
 - built with ppp-2.4.8.

+ 11 - 5
b/brotli/brotli-vl.spec

@@ -1,11 +1,10 @@
 %bcond_with test
 %bcond_with test
 
 
-Name:           brotli
-Version:        1.0.7
-Release:        3%{?_dist_release}
 Summary:        Lossless compression algorithm
 Summary:        Lossless compression algorithm
 Summary(ja):    ロスレス圧縮アルゴリズム
 Summary(ja):    ロスレス圧縮アルゴリズム
-
+Name:           brotli
+Version:        1.0.7
+Release:        4%{?_dist_release}
 Vendor:         Project Vine
 Vendor:         Project Vine
 Distribution:   Vine Linux
 Distribution:   Vine Linux
 
 
@@ -49,6 +48,7 @@ to the best currently available general-purpose compression methods.
 It is similar in speed with deflate but offers more dense compression.
 It is similar in speed with deflate but offers more dense compression.
 This package installs the development files
 This package installs the development files
 
 
+
 %prep
 %prep
 %autosetup
 %autosetup
 # fix permissions for -debuginfo
 # fix permissions for -debuginfo
@@ -67,6 +67,7 @@ cd build
 cd ..
 cd ..
 %py3_build
 %py3_build
 
 
+
 %install
 %install
 cd build
 cd build
 %make_install
 %make_install
@@ -82,10 +83,11 @@ for i in *.3;do
 %{__install} -m644 "$i" "%{buildroot}%{_mandir}/man3/${i}brotli"
 %{__install} -m644 "$i" "%{buildroot}%{_mandir}/man3/${i}brotli"
 done
 done
 
 
-%post -p /sbin/ldconfig
 
 
+%post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
 
+
 %if %{with test}
 %if %{with test}
 %check
 %check
 cd build
 cd build
@@ -94,6 +96,7 @@ cd ..
 %{__python3} setup.py test
 %{__python3} setup.py test
 %endif
 %endif
 
 
+
 %files
 %files
 %{_bindir}/brotli
 %{_bindir}/brotli
 %{_libdir}/*.so.*
 %{_libdir}/*.so.*
@@ -113,6 +116,9 @@ cd ..
 
 
 
 
 %changelog
 %changelog
+* Tue Aug 04 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.0.7-4
+- rebuilt with current environment.
+
 * Thu Jan 03 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.0.7-3
 * Thu Jan 03 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.0.7-3
 - initial build for Vine Linux.
 - initial build for Vine Linux.
 
 

+ 22 - 9
lib/libs/libseccomp/libseccomp-vl.spec

@@ -1,17 +1,19 @@
+%bcond_without tests
+
 Summary: Enhanced seccomp library
 Summary: Enhanced seccomp library
 Name: libseccomp
 Name: libseccomp
-Version: 2.4.1
+Version: 2.5.0
 Release: 1%{?_dist_release}
 Release: 1%{?_dist_release}
-ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 mipsel mips64el ppc64 ppc64le s390 s390x
+Vendor: Project Vine
+Distribution: Vine Linux
+
 License: LGPLv2
 License: LGPLv2
-Group: System Environment/Libraries
-Source: https://github.com/seccomp/libseccomp/releases/download/v%{version}/%{name}-%{version}.tar.gz
 URL: https://github.com/seccomp/libseccomp
 URL: https://github.com/seccomp/libseccomp
-#BuildRequires: valgrind >= 1:3.13.0-4
+Source: https://github.com/seccomp/libseccomp/releases/download/v%{version}/%{name}-%{version}.tar.gz
 
 
-Vendor: Project Vine
-Distribution: Vine Linux
-Packager: tomop
+ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 mipsel mips64el ppc64 ppc64le s390 s390x
+#BuildRequires: valgrind >= 1:3.13.0-4
+BuildRequires: gperf
 
 
 %description
 %description
 The libseccomp library provides an easy to use interface to the Linux Kernel's
 The libseccomp library provides an easy to use interface to the Linux Kernel's
@@ -20,6 +22,7 @@ to specify which syscalls, and optionally which syscall arguments, the
 application is allowed to execute, all of which are enforced by the Linux
 application is allowed to execute, all of which are enforced by the Linux
 Kernel.
 Kernel.
 
 
+
 %package devel
 %package devel
 Summary: Development files used to build applications with libseccomp support
 Summary: Development files used to build applications with libseccomp support
 Group: Development/Libraries
 Group: Development/Libraries
@@ -32,6 +35,7 @@ to specify which syscalls, and optionally which syscall arguments, the
 application is allowed to execute, all of which are enforced by the Linux
 application is allowed to execute, all of which are enforced by the Linux
 Kernel.
 Kernel.
 
 
+
 %package static
 %package static
 Summary: Enhanced seccomp static library
 Summary: Enhanced seccomp static library
 Group: Development/Libraries
 Group: Development/Libraries
@@ -44,13 +48,16 @@ to specify which syscalls, and optionally which syscall arguments, the
 application is allowed to execute, all of which are enforced by the Linux
 application is allowed to execute, all of which are enforced by the Linux
 Kernel.
 Kernel.
 
 
+
 %prep
 %prep
 %setup -q
 %setup -q
 
 
+
 %build
 %build
 %configure
 %configure
 make V=1 %{?_smp_mflags}
 make V=1 %{?_smp_mflags}
 
 
+
 %install
 %install
 rm -rf "%{buildroot}"
 rm -rf "%{buildroot}"
 mkdir -p "%{buildroot}/%{_libdir}"
 mkdir -p "%{buildroot}/%{_libdir}"
@@ -59,13 +66,15 @@ mkdir -p "%{buildroot}/%{_mandir}"
 make V=1 DESTDIR="%{buildroot}" install
 make V=1 DESTDIR="%{buildroot}" install
 rm -f "%{buildroot}/%{_libdir}/libseccomp.la"
 rm -f "%{buildroot}/%{_libdir}/libseccomp.la"
 
 
+%if %{with tests}
 %check
 %check
 make V=1 check
 make V=1 check
+%endif
 
 
 %post -p /sbin/ldconfig
 %post -p /sbin/ldconfig
-
 %postun -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
 
+
 %files
 %files
 %{!?_licensedir:%global license %%doc}
 %{!?_licensedir:%global license %%doc}
 %license LICENSE
 %license LICENSE
@@ -77,6 +86,7 @@ make V=1 check
 
 
 %files devel
 %files devel
 %{_includedir}/seccomp.h
 %{_includedir}/seccomp.h
+%{_includedir}/seccomp-syscalls.h
 %{_libdir}/libseccomp.so
 %{_libdir}/libseccomp.so
 %{_libdir}/pkgconfig/libseccomp.pc
 %{_libdir}/pkgconfig/libseccomp.pc
 %{_bindir}/scmp_sys_resolver
 %{_bindir}/scmp_sys_resolver
@@ -87,6 +97,9 @@ make V=1 check
 %{_libdir}/libseccomp.a
 %{_libdir}/libseccomp.a
 
 
 %changelog
 %changelog
+* Tue Aug 04 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 2.5.0-1
+- new upstream release.
+
 * Sun May 05 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 2.4.1-1
 * Sun May 05 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 2.4.1-1
 - new upstream release.
 - new upstream release.
 
 

+ 5 - 3
w/woff2/woff2-vl.spec

@@ -1,8 +1,7 @@
+Summary:        Web Open Font Format 2.0 library
 Name:           woff2
 Name:           woff2
 Version:        1.0.2
 Version:        1.0.2
-Release:        5%{?_dist_release}
-Summary:        Web Open Font Format 2.0 library
-
+Release:        6%{?_dist_release}
 Vendor:         Project Vine
 Vendor:         Project Vine
 Distribution:   Vine Linux
 Distribution:   Vine Linux
 
 
@@ -59,6 +58,9 @@ make %{?_smp_mflags} -C %{_target_platform}
 %{_libdir}/pkgconfig/libwoff2enc.pc
 %{_libdir}/pkgconfig/libwoff2enc.pc
 
 
 %changelog
 %changelog
+* Tue Aug 04 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.0.2-6
+- rebuilt with current environment.
+
 * Thu Jan 03 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.0.2-5
 * Thu Jan 03 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.0.2-5
 - initial build for Vine Linux.
 - initial build for Vine Linux.