Browse Source

updated 4 packages

gyp-0.1-4.gite87d37d6

http-parser-2.9.4-1

libgit2-glib-0.28.0.1-1

libgit2-1.0.0-1

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

+ 57 - 27
g/gyp/gyp-vl.spec

@@ -1,25 +1,38 @@
-%define	ver	0.1
-%define	rel	3
-%define	svnrev	1569
-
-Summary: Generate Your Projects
-Name: gyp
-Version: %{ver}
-Release: %{rel}.svn%{svnrev}%{?_dist_release}
-License: BSD
-Group: Development/Tools
-URL: http://code.google.com/p/gyp/
-# svn checkout http://gyp.googlecode.com/svn/trunk gyp
-Source0: %{name}-%{version}-svn%{svnrev}.tar.bz2
+%define	githash	e87d37d6
+
+Summary:        Generate Your Projects
+Name:           gyp
+Version:        0.1
+Release:        4.git%{githash}%{?_dist_release}
+Group:          Development/Tools
+Vendor:         Project Vine
+Distribution:   Vine Linux
+Packager:       iwaim
+
+License:        BSD
+URL:            https://gyp.gsrc.io
+# 1. git clone https://chromium.googlesource.com/external/gyp
+# 2. cd gyp
+# 3. version=$(grep version= setup.py|cut -d\' -f2)
+# 4. revision=$(git log --oneline|head -1|cut -d' ' -f1)
+# 5. cd ..
+# 6. tar -a --exclude-vcs -cf gyp-$version-git$revision.tar.xz gyp
+Source0:        %{name}-%{version}-git%{githash}.tar.xz
 Patch0:         gyp-rpmoptflags.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-BuildArch: noarch
-BuildRequires: python-devel
-Requires: python
+Patch1:         gyp-ninja-build.patch
+Patch2:         gyp-python3.patch
+Patch3:         gyp-python38.patch
+Patch4:         gyp-fix-cmake.patch
+Patch5:         gyp-python39.patch
 
-Vendor: Project Vine
-Distribution: Vine Linux
-Packager: iwaim
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildArch:      noarch
+BuildRequires:  python3-devel
+BuildRequires:  python3-rpm-macros
+BuildRequires:  python3-setuptools
+BuildRequires:  ninja
+Requires:       python3
+Requires:       python3-setuptools
 
 %description
 GYP is a tool to generates native Visual Studio, Xcode and SCons
@@ -29,28 +42,45 @@ Its syntax is a universal cross-platform build representation
 that still allows sufficient per-platform flexibility to accommodate
 irreconcilable differences.
 
+
 %prep
-%setup -q -c -n %{name}-%{version}-svn%{svnrev}
-%patch0 -p1 -b .0-rpmoptflags
+%setup -q -n %{name}
+%autopatch -p1
+for i in $(find pylib -name '*.py'); do
+  sed -e '\,#![ \t]*/.*python,{d}' $i > $i.new && touch -r $i $i.new && mv $i.new $i
+done
+
 
 %build
-%{__python} setup.py build
+%py3_build
+
 
 %install
 %{__rm} -rf %{buildroot}
-%{__python} setup.py install --root %{buildroot}
+%py3_install
+
+
+%check
+%{__python3} gyptest.py test/hello/gyptest-all.py
+
 
 %clean
 %{__rm} -rf %{buildroot}
 
+
 %files
 %defattr(-,root,root,-)
-%doc LICENSE AUTHORS samples tools
+%license LICENSE
+%doc AUTHORS
 %{_bindir}/gyp
-%{python_sitelib}/gyp-*.egg-info
-%{python_sitelib}/gyp
+%{python3_sitelib}/*
 
 %changelog
+* Tue May 05 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.1-4.gite87d37d6
+- updated to git HEAD.
+- import Patch1-5 from rawhide.
+- switch to python3.
+
 * Fri Mar 22 2013 Daisuke SUZUKI <daisuke@linux.or.jp> 1.0.46-1
 - update to svn r1569
 

+ 40 - 25
h/http-parser/http-parser-vl.spec

@@ -1,24 +1,20 @@
 Summary:	http request/response parser for c 
 Name:		http-parser
-Version:	2.4.2
-Release:	2%{?_dist_release}
-License:	MIT
+Version:	2.9.4
+Release:	1%{?_dist_release}
 Group:		System Environment/Libraries 
-URL:		https://github.com/joyent/http-parser
+Vendor:		Project Vine
+Distribution:	Vine Linux
 
-# https://github.com/joyent/%{name}/archive/v%{version}.tar.gz
-Source0:	%{name}-%{version}.tar.gz
+License:	MIT
+URL:		https://github.com/nodejs/http-parser
+Source0:	https://github.com/nodejs/http-parser/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
 
 # based on fedora
-Patch0:		http-parser-gyp-sharedlib.patch
-
-BuildRequires: gyp
+Patch0:		0001-url-treat-empty-port-as-default.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
-
-Vendor:		Project Vine
-Distribution:	Vine Linux
-Packager:	Takemikaduchi
+BuildRequires:	meson
 
 %description
 This is a parser for HTTP messages written in C. It parses both
@@ -34,7 +30,6 @@ Summary:        Development tools for %{name}
 Summary(ja):    %{name} の開発環境
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
-Requires:       pkgconfig
 
 %description    devel
 Header files and libraries for building a extension library for the %{name}.
@@ -44,24 +39,36 @@ Header files and libraries for building a extension library for the %{name}.
 %setup -q
 %patch0 -p1
 
+cat > meson.build << EOF
+project('%{name}', 'c', version : '%{version}')
+install_headers('http_parser.h')
+foreach x : [['http_parser',        ['-DHTTP_PARSER_STRICT=0']],
+             ['http_parser_strict', ['-DHTTP_PARSER_STRICT=1']]]
+  lib = library(x.get(0), 'http_parser.c',
+                c_args : x.get(1),
+                version : '%{version}',
+                install : true)
+  test('test-@0@'.format(x.get(0)),
+       executable('test-@0@'.format(x.get(0)), 'test.c',
+                  c_args : x.get(1),
+                  link_with : lib),
+       timeout : 60)
+endforeach
+EOF
+
 
 %build
-export CFLAGS='%{optflags} -fPIC'
-gyp -f make --depth=`pwd` http_parser.gyp
-make %{?_smp_mflags} BUILDTYPE=Release 
+%meson
+%meson_build
 
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
+%meson_install
 
-mkdir -p ${RPM_BUILD_ROOT}/%{_libdir}
-mkdir -p ${RPM_BUILD_ROOT}/%{_includedir}
 
-mv out/Release/lib.target/libhttp_parser.so.2 libhttp_parser.so.%{version}
-install -m 0755 libhttp_parser.so.%{version} ${RPM_BUILD_ROOT}%{_libdir}/libhttp_parser.so.%{version}
-ln -sf libhttp_parser.so.%{version} ${RPM_BUILD_ROOT}%{_libdir}/libhttp_parser.so.2
-install libhttp_parser.so.%{version} ${RPM_BUILD_ROOT}%{_libdir}/libhttp_parser.so
-install -m 0644 http_parser.h ${RPM_BUILD_ROOT}%{_includedir}/
+%check
+%meson_test
 
 
 %clean
@@ -74,16 +81,24 @@ install -m 0644 http_parser.h ${RPM_BUILD_ROOT}%{_includedir}/
 
 %files
 %defattr(-,root,root,-)
-%doc LICENSE-MIT README.md
+%license LICENSE-MIT
+%doc AUTHORS README.md
 %{_libdir}/libhttp_parser.so.*
+%{_libdir}/libhttp_parser_strict.so.*
 
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/http_parser.h
 %{_libdir}/libhttp_parser.so
+%{_libdir}/libhttp_parser_strict.so
 
 
 %changelog
+* Tue May 05 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.9.4-1
+- new upstream release.
+- dropped Patch0.
+- imported Patch0 from rawhide.
+
 * Thu Sep 01 2016 Toshiaki Ara <ara_t@384.jp> - 2.4.2-2
 - rebuild with gcc-5.4.0
 

+ 17 - 17
lib/libg/libgit2-glib/libgit2-glib-vl.spec

@@ -9,17 +9,19 @@
 Summary: GLib wrapper for libgit2
 Summary(ja):  libgit2 用 GLib ラッパー
 Name:    libgit2-glib
-Version: 0.26.4
+Version: 0.28.0.1
 Release: 1%{?_dist_release}
-License: LGPLv2.1
 Group:   System Environment/Libraries
-URL:     https://wiki.gnome.org/Projects/Libgit2-glib
-
-Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.26/%{name}-%{version}.tar.xz
+Vendor:   Project Vine
+Distribution: Vine Linux
 
-# Patch from Debian (buster)
-Patch1:  libgit2-0.27-compat.patch
+License: LGPLv2.1
+URL:     https://wiki.gnome.org/Projects/Libgit2-glib
+%global  shortver %(echo %{version} | cut -d . -f 1,2)
+Source0: https://download.gnome.org/sources/libgit2-glib/%{shortver}/%{name}-%{version}.tar.xz
 
+# Patch from upstream
+Patch0:  libgit2-1.patch
 
 BuildRequires: glib2-devel
 BuildRequires: libgit2-devel
@@ -30,10 +32,6 @@ BuildRequires: meson vala-devel vala-tools pygobject3-devel
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-root
 
-Vendor:   Project Vine
-Distribution: Vine Linux
-Packager: Takemikaduchi
-
 %description
 libgit2-glib is a glib wrapper library around the libgit2 git access library.
 
@@ -64,7 +62,7 @@ This package contains documentation for %{name}.
 
 %prep
 %setup -q
-%patch1 -p1
+%patch0 -p1
 
 %build
 %meson -Dgtk_doc=true -Dpython=true
@@ -74,10 +72,6 @@ This package contains documentation for %{name}.
 %{__rm} -rf ${RPM_BUILD_ROOT}
 %meson_install
 
-%ifarch x86_64
-%{__mv} ${RPM_BUILD_ROOT}/usr/lib/* ${RPM_BUILD_ROOT}%{_libdir}
-%endif
-
 find ${RPM_BUILD_ROOT} -name '*.a' -exec rm -f {} \;
 find ${RPM_BUILD_ROOT} -name '*.la' -exec rm -f {} \;
 
@@ -95,7 +89,8 @@ find ${RPM_BUILD_ROOT} -name '*.la' -exec rm -f {} \;
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog NEWS README
+%license COPYING
+%doc AUTHORS ChangeLog NEWS README
 %{_libdir}/%{name}-1.0.so.*
 %{_libdir}/girepository-1.0/Ggit-1.0.typelib
 %{python3_sitearch}/gi/overrides/*
@@ -115,6 +110,11 @@ find ${RPM_BUILD_ROOT} -name '*.la' -exec rm -f {} \;
 
 
 %changelog
+* Tue May 05 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.28.0.1-1
+- new upstream release.
+- dropped Patch1.
+- imported Patch0 from upstream.
+
 * Tue Aug 21 2018 Toshiaki Ara <ara_t@384.jp> 0.26.4-1
 - new upstream release
 - add BuildRequires: python3-devel

+ 24 - 24
lib/libg/libgit2/libgit2-vl.spec

@@ -1,26 +1,22 @@
-Summary:  C implementation of the Git core methods as a library with a solid API 
-Name:    libgit2
-Version: 0.27.8
-Release: 2%{?_dist_release}
-License: GPLv2
-Group:   System Environment/Libraries
-URL:     https://libgit2.github.com/
-
-# https://github.com/libgit2/libgit2/archive/v0.23.3.tar.gz
-Source0:  %{name}-%{version}.tar.gz
-
-BuildRequires: cmake
-BuildRequires: openssl-devel
-BuildRequires: http-parser-devel
-BuildRequires: curl-devel
-BuildRequires: libssh2-devel
-BuildRequires: zlib-devel
-
-BuildRoot:  %{_tmppath}/%{name}-%{version}-root
-
-Vendor:   Project Vine
-Distribution: Vine Linux
-Packager: Takemikaduchi
+Summary:        C implementation of the Git core methods as a library with a solid API 
+Name:           libgit2
+Version:        1.0.0
+Release:        1%{?_dist_release}
+Group:          System Environment/Libraries
+Vendor:         Project Vine
+Distribution:   Vine Linux
+
+License:        GPLv2
+URL:            https://libgit2.org/
+Source0:        https://github.com/libgit2/libgit2/releases/download/v%{version}/%{name}-%{version}.tar.gz
+
+BuildRoot:      %{_tmppath}/%{name}-%{version}-root
+BuildRequires:  cmake
+BuildRequires:  openssl-devel
+BuildRequires:  http-parser-devel
+BuildRequires:  curl-devel
+BuildRequires:  libssh2-devel
+BuildRequires:  zlib-devel
 
 %description
 libgit2 is a portable, pure C implementation of the Git core methods
@@ -76,7 +72,8 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \;
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING CHANGELOG.md README.md
+%license COPYING
+%doc AUTHORS README.md
 %{_libdir}/%{name}.so.*
 
 %files devel
@@ -88,6 +85,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \;
 
 
 %changelog
+* Tue May 05 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.0.0-1
+- new upstream release.
+
 * Mon Mar 25 2019 Toshiaki Ara <ara_t@384.jp> 0.27.8-2
 - correct date