updated 5 packages

bubblewrap-0.3.3-4

cmake-3.15.3-1

jsoncpp-1.9.1-1

webkitgtk4-2.26.0-1

xdg-dbus-proxy-0.1.2-1

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

b/bubblewrap/bubblewrap-vl.spec

@@ -0,0 +1,127 @@
+Name:           bubblewrap
+Version:        0.3.3
+Release:        4%{?_dist_release}
+Summary:        Core execution tool for unprivileged containers
+
+License:        LGPLv2+
+Vendor:         Project Vine
+Distribution:   Vine Linux
+#VCS: git:https://github.com/projectatomic/bubblewrap
+URL:            https://github.com/projectatomic/bubblewrap
+Source0:        https://github.com/projectatomic/bubblewrap/releases/download/v%{version}/bubblewrap-%{version}.tar.xz
+
+BuildRequires: autoconf automake libtool
+BuildRequires: gcc
+BuildRequires: libcap-devel
+BuildRequires: libxslt
+BuildRequires: docbook-style-xsl
+
+%description
+Bubblewrap (/usr/bin/bwrap) is a core execution engine for unprivileged
+containers that works as a setuid binary on kernels without
+user namespaces.
+
+%prep
+%autosetup
+
+%build
+if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; fi
+%configure \
+	--disable-silent-rules \
+	--with-priv-mode=none \
+	--disable-selinux
+%make_build
+
+%install
+%make_install INSTALL="install -p -c"
+find %{buildroot} -name '*.la' -delete -print
+
+%files
+%license COPYING
+%dir %{_datadir}/bash-completion
+%dir %{_datadir}/bash-completion/completions
+%{_datadir}/bash-completion/completions/bwrap
+%if (0%{?rhel} != 0 && 0%{?rhel} <= 7)
+%attr(0755,root,root) %caps(cap_sys_admin,cap_net_admin,cap_sys_chroot,cap_setuid,cap_setgid=ep) %{_bindir}/bwrap
+%else
+%{_bindir}/bwrap
+%endif
+%{_mandir}/man1/*
+
+%changelog
+* Fri Sep 20 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 0.3.3-4
+- initial build for Vine Linux.
+
+* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Wed May 01 2019 Colin Walters <walters@redhat.com> - 0.3.3-2
+- New upstream release
+
+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Mon Oct 01 2018 Kalev Lember <klember@redhat.com> - 0.3.1-1
+- Update to 0.3.1
+
+* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Wed Jul 11 2018 Colin Walters <walters@verbum.org> - 0.3.0-1
+- https://github.com/projectatomic/bubblewrap/releases/tag/v0.3.0
+
+* Wed May 16 2018 Kalev Lember <klember@redhat.com> - 0.2.1-1
+- Update to 0.2.1
+
+* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Mon Oct 09 2017 Colin Walters <walters@verbum.org> - 0.2.0-2
+- New upstream version
+- https://github.com/projectatomic/bubblewrap/releases/tag/v0.2.0
+
+* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.8-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.8-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Tue Mar 28 2017 Colin Walters <walters@verbum.org> - 0.1.8-1
+- New upstream version
+  https://github.com/projectatomic/bubblewrap/releases/tag/v0.1.8
+
+* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.7-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Wed Jan 18 2017 Colin Walters <walters@verbum.org> - 0.1.7-1
+- New upstream version;
+  https://github.com/projectatomic/bubblewrap/releases/tag/v0.1.7
+- Resolves: #1411814
+
+* Tue Jan 10 2017 Colin Walters <walters@verbum.org> - 0.1.6-1
+- New upstream version with security fix
+- Resolves: #1411814
+
+* Mon Dec 19 2016 Kalev Lember <klember@redhat.com> - 0.1.5-1
+- Update to 0.1.5
+
+* Tue Dec 06 2016 walters@redhat.com - 0.1.4-4
+- Backport fix for regression in previous commit for rpm-ostree
+
+* Thu Dec 01 2016 walters@redhat.com - 0.1.4-3
+- Backport patch to fix running via nspawn, which should fix rpm-ostree-in-bodhi
+
+* Tue Nov 29 2016 Kalev Lember <klember@redhat.com> - 0.1.4-1
+- Update to 0.1.4
+
+* Fri Oct 14 2016 Colin Walters <walters@verbum.org> - 0.1.3-2
+- New upstream version
+
+* Mon Sep 12 2016 Kalev Lember <klember@redhat.com> - 0.1.2-1
+- Update to 0.1.2
+
+* Tue Jul 12 2016 Igor Gnatenko <ignatenko@redhat.com> - 0.1.1-2
+- Trivial fixes in packaging
+
+* Fri Jul 08 2016 Colin Walters <walters@verbum.org> - 0.1.1
+- Initial package

c/cmake/cmake-vl.spec

@@ -5,19 +5,19 @@
 %bcond_with gui
 
 %global major_version 3
-%global minor_version 10
+%global minor_version 15
 
 Name: cmake
 Summary: Cross-platform make system
 Summary(ja): クロスプラットフォームな Make システム
-Version: 3.10.1
+Version: 3.15.3
 Release: 1%{?_dist_release}
 
 Group: Development/Tools
 License: BSD
 URL: http://www.cmake.org/
 
-Source0: http://www.cmake.org/files/v3.10/%{name}-%{version}.tar.gz
+Source0: https://github.com/Kitware/CMake/releases/download/v%{version}/cmake-%{version}.tar.gz
 Source1: macros.cmake
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -150,6 +150,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 
 
 %changelog
+* Sat Sep 21 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.15.3-1
+- updated to 3.15.3.
+
 * Mon Jan 01 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.10.1-1
 - updated to 3.10.1.
 - updated macros.cmake.

j/jsoncpp/jsoncpp-vl.spec

@@ -1,20 +1,24 @@
-Name:       jsoncpp
-Version:    0.7.1
-Release:    2%{?_dist_release}
-Summary:    JSON library implemented in C++
-Summary(ja): C++ で実装された JSON ライブラリ
+Name:           jsoncpp
+Version:        1.9.1
+Release:        1%{?_dist_release}
+Summary:        JSON library implemented in C++
+Summary(ja):    C++ で実装された JSON ライブラリ
 
-Group:      System Environment/Libraries
-License:    Public Domain or MIT
-URL:        http://sourceforge.net/projects/%{name}/
-Source0:    https://github.com/open-source-parsers/jsoncpp/archive/0.7.1.tar.gz
-Source1:    jsoncpp.pc
+Group:          System Environment/Libraries
+License:        Public Domain or MIT
 
-Patch0:     asstring.patch
+Vendor:         Project Vine
+Distribution:   Vine Linux
+
+URL:            https://github.com/open-source-parsers/jsoncpp
+Source0:        https://github.com/open-source-parsers/jsoncpp/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
+
+Patch0000:      %{name}-1.9.1-fix_version.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
-BuildRequires:  python scons doxygen
-BuildRequires:  graphviz
+BuildRequires:  cmake > 3.15.0
+BuildRequires:  python3-devel
+BuildRequires:  python3-rpm-macros
 
 %description
 %{name} is an implementation of a JSON (http://json.org) reader and writer in
@@ -28,55 +32,37 @@ Summary:    Development headers and library for %{name}
 Summary(ja): %{name} の開発用ヘッダファイルとライブラリ
 Group:      Development/Libraries
 Requires:   %{name} = %{version}-%{release}
-
+Obsoletes:  %{name}-doc < 1.0.0
 %description devel
 This package contains the development headers and library for %{name}.
 
 
-%package doc
-Summary:    Documentation for %{name}
-Summary(ja): %{name} のドキュメント
-Group:      Documentation
-BuildArch:  noarch
-
-%description doc
-This package contains the documentation for %{name}
-
-
 %prep
-%setup -q
-#%patch0 -dsrc/lib_json -p1
-grep -e "-Wall" SConstruct
-sed 's/CCFLAGS = "-Wall"/CCFLAGS = "%{optflags}"/' -i SConstruct
-sed 's/README\.txt/README\.md/' -i SConstruct
+%autosetup -p1
 
 %build
-scons platform=linux-gcc %{?_smp_mflags}
-# Now, lets make a proper shared lib. :P
-g++ -o libjsoncpp.so.0.0.0 -shared -Wl,-soname,libjsoncpp.so.0 buildscons/linux-gcc-*/src/lib_json/*.os -lpthread
-# Build the doc
-python doxybuild.py --with-dot --doxygen %{_bindir}/doxygen
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+
+%cmake -DBUILD_STATIC_LIBS=OFF                \
+       -DJSONCPP_WITH_WARNING_AS_ERROR=OFF    \
+       -DJSONCPP_WITH_PKGCONFIG_SUPPORT=ON    \
+       -DJSONCPP_WITH_CMAKE_PACKAGE=ON        \
+       -DJSONCPP_WITH_POST_BUILD_UNITTEST=OFF \
+       -DPYTHON_EXECUTABLE="%{__python3}"     \
+       ..
+popd
+%make_build -C %{_target_platform}
+
 
 %check
-# Fails due to patch0
-# scons platform=linux-gcc check %{?_smp_mflags}
+%make_build -C %{_target_platform} jsoncpp_check
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -p -D lib%{name}.so.0.0.0 $RPM_BUILD_ROOT%{_libdir}/lib%{name}.so.0.0.0
-ln -s %{_libdir}/lib%{name}.so.0.0.0 $RPM_BUILD_ROOT%{_libdir}/lib%{name}.so
-ln -s %{_libdir}/lib%{name}.so.0.0.0 $RPM_BUILD_ROOT%{_libdir}/lib%{name}.so.0
-
-install -d $RPM_BUILD_ROOT%{_includedir}/%{name}/json
-install -p -m 0644 include/json/*.h $RPM_BUILD_ROOT%{_includedir}/%{name}/json
-mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}/html
-for f in AUTHORS LICENSE NEWS.txt README.md; do
-    install -p -m 0644 $f $RPM_BUILD_ROOT%{_docdir}/%{name}
-done
-install -p -m 0644 dist/doxygen/*/*.{html,png} $RPM_BUILD_ROOT%{_docdir}/%{name}/html
-install -d $RPM_BUILD_ROOT%{_libdir}/pkgconfig
-install -p -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_libdir}/pkgconfig/
-sed -i 's|@@LIBDIR@@|%{_libdir}|g' $RPM_BUILD_ROOT%{_libdir}/pkgconfig/jsoncpp.pc
+%make_install -C %{_target_platform}
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -85,20 +71,26 @@ rm -rf $RPM_BUILD_ROOT
 %postun -p /sbin/ldconfig
 
 %files
-%{_docdir}/%{name}/
-%exclude %{_docdir}/%{name}/html
-%{_libdir}/lib%{name}.so.0
-%{_libdir}/lib%{name}.so.0.0.0
+%license AUTHORS LICENSE
+%doc README*
+%{_libdir}/lib%{name}.so.*
 
 %files devel
+%doc doc/*.html
 %{_libdir}/lib%{name}.so
-%{_includedir}/%{name}/
-%{_libdir}/pkgconfig/jsoncpp.pc
+%{_includedir}/json
+%{_libdir}/cmake/*
+%{_libdir}/pkgconfig/%{name}.pc
 
-%files doc
-%{_docdir}/%{name}/
 
 %changelog
+* Sat Sep 21 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.9.1-1
+- new upstream release.
+- dropped Source1.
+- dropped Patch0.
+- imported Patch0000 from rawhide.
+- dropped a sub-package "doc".
+
 * Thu Jun 30 2016 Yoji TOYODA <bsyamato@sea.plala.or.jp> - 0.7.1-2
 - rebuild with gcc-5.4.0
 

w/webkitgtk4/webkitgtk4-vl.spec

@@ -1,4 +1,4 @@
-%bcond_without clang
+%bcond_with clang
 
 ## NOTE: Lots of files in various subdirectories have the same name (such as
 ## "LICENSE") so this short macro allows us to distinguish them by using their
@@ -8,17 +8,17 @@
         cp -p %1 _license_files/$(echo '%1' | sed -e 's!/!.!g')
 
 Name:           webkitgtk4
-Version:        2.24.3
+Version:        2.26.0
 Release:        1%{?_dist_release}
 Summary:        GTK+ Web content engine library
 
 License:        LGPLv2
-Group:			System Environment/Libraries
+Group:          System Environment/Libraries
 URL:            http://www.webkitgtk.org/
 Vendor:         Project Vine
 Distribution:   Vine Linux
 
-Source0:        http://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz
+Source0:        https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz
 
 Patch3:         webkitgtk-2.5.2-commit_align.patch
 
@@ -28,6 +28,7 @@ BuildRequires:  lld
 %endif
 BuildRequires:  at-spi2-core-devel
 BuildRequires:  bison
+BuildRequires:  bubblewrap
 BuildRequires:  cairo-devel
 BuildRequires:  cmake
 BuildRequires:  enchant-devel
@@ -47,22 +48,27 @@ BuildRequires:  harfbuzz-icu-devel
 BuildRequires:  libicu-devel
 BuildRequires:  libjpeg-turbo-devel
 BuildRequires:  libpng-devel
+BuildRequires:  libseccomp-devel
 BuildRequires:  libsecret-devel
 BuildRequires:  libsoup-devel
 BuildRequires:  libwebp-devel
 BuildRequires:  libxslt-devel
 BuildRequires:  libXt-devel
+BuildRequires:  ninja
 BuildRequires:  mesa-libGL-devel
 BuildRequires:  pcre-devel
+BuildRequires:  python3-devel
 BuildRequires:  ruby
 BuildRequires:  sqlite3-devel
 BuildRequires:  libnotify-devel
 BuildRequires:  hyphen-devel
 BuildRequires:  woff2-devel
-%ifarch ppc
-BuildRequires:  libatomic
-%endif
-Requires:       geoclue2
+BuildRequires:  xdg-dbus-proxy
+#Requires:       geoclue2
+
+# for sandbox
+Requires:       bubblewrap
+Requires:       xdg-dbus-proxy
 
 # Require the jsc subpackage
 Requires:       %{name}-jsc = %{version}-%{release}
@@ -143,6 +149,7 @@ export LD=ld.lld
 %endif
 
 %cmake \
+  -GNinja \
 %if %{with clang}
   -DCOMPILER_IS_CLANG=ON \
   -DCMAKE_CXX_COMPILER=clang++ \
@@ -153,13 +160,14 @@ export LD=ld.lld
   -DENABLE_LLINT_C_LOOP=ON \
   -DUSE_GSTREAMER_GL=OFF \
   -DUSE_OPENJPEG=OFF \
+  -DENABLE_GTKDOC=OFF \
   ..
 popd
 
-make %{?_smp_mflags} -C %{_target_platform}
+ninja -C %{_target_platform}
 
 %install
-%make_install -C %{_target_platform}
+DESTDIR=%{buildroot} ninja -C %{_target_platform} install
 
 %find_lang WebKit2GTK-4.0
 
@@ -217,7 +225,12 @@ make %{?_smp_mflags} -C %{_target_platform}
 %{_datadir}/gir-1.0/JavaScriptCore-4.0.gir
 
 %changelog
+* Fri Sep 20 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 2.26.0-1
+- new upstream release.
+- switched build-system to ninja.
+
 * Tue Aug 27 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 2.24.3-1
+- new upstream release.
 
 * Thu Jan 03 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 2.22.5-1
 - new upstream release.

x/xdg-dbus-proxy/xdg-dbus-proxy-vl.spec

@@ -0,0 +1,58 @@
+Name:           xdg-dbus-proxy
+Version:        0.1.2
+Release:        1%{?_dist_release}
+Summary:        Filtering proxy for D-Bus connections
+Vendor:         Project Vine
+Distribution:   Vine Linux
+
+License:        LGPLv2+
+URL:            https://github.com/flatpak/xdg-dbus-proxy/
+Source0:        https://github.com/flatpak/xdg-dbus-proxy/releases/download/%{version}/%{name}-%{version}.tar.xz
+
+BuildRequires:  docbook-style-xsl
+BuildRequires:  gcc
+BuildRequires:  pkgconfig(gio-2.0)
+BuildRequires:  pkgconfig(gio-unix-2.0)
+BuildRequires:  pkgconfig(glib-2.0)
+BuildRequires:  /usr/bin/xsltproc
+
+Requires:       dbus
+
+%description
+xdg-dbus-proxy is a filtering proxy for D-Bus connections. It was originally
+part of the flatpak project, but it has been broken out as a standalone module
+to facilitate using it in other contexts.
+
+%prep
+%autosetup -p1
+
+%build
+%configure
+%make_build
+
+%install
+%make_install
+
+%files
+%license COPYING
+%{_bindir}/xdg-dbus-proxy
+%{_mandir}/man1/xdg-dbus-proxy.1*
+
+%changelog
+* Fri Sep 20 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 0.1.2-1
+- initial build for Vine Linux.
+- new upstream release.
+
+* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Tue Jan 15 2019 Kalev Lember <klember@redhat.com> - 0.1.1-1
+- Update to 0.1.1
+- Build man pages
+- Include COPYING file as license
+
+* Fri Nov 23 2018 Kalev Lember <klember@redhat.com> - 0.1.0-1
+- Initial Fedora packaging