Browse Source

updated 2 packages

libgit2-glib-0.99.0.1-1

libgit2-1.3.0-1
Tomohiro "Tomo-p" KATO 2 years ago
parent
commit
26d2d2a1b9
2 changed files with 58 additions and 54 deletions
  1. 39 37
      lib/libg/libgit2-glib/libgit2-glib-vl.spec
  2. 19 17
      lib/libg/libgit2/libgit2-vl.spec

+ 39 - 37
lib/libg/libgit2-glib/libgit2-glib-vl.spec

@@ -1,36 +1,30 @@
-%{!?python3_sitearch: %define python3_sitearch %(python3 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
-
-%global _vpath_srcdir .
-%global _vpath_builddir builddir
-%global __global_cflags ""
-%global __global_ldflags ""
-
-
-Summary: GLib wrapper for libgit2
-Summary(ja):  libgit2 用 GLib ラッパー
-Name:    libgit2-glib
-Version: 0.28.0.1
-Release: 1%{?_dist_release}
-Group:   System Environment/Libraries
-Vendor:   Project Vine
-Distribution: Vine Linux
-
-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
+Summary:        GLib wrapper for libgit2
+Summary(ja):    libgit2 用 GLib ラッパー
+Name:           libgit2-glib
+Version:        0.99.0.1
+Release:        1%{?_dist_release}
+Group:          system
+Vendor:         Project Vine
+Distribution:   Vine Linux
+
+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
+Patch0:         20.patch
+Patch1:         22.patch
 
-BuildRequires: glib2-devel
-BuildRequires: libgit2-devel
-BuildRequires: gobject-introspection-devel
-BuildRequires: gtk-doc
-BuildRequires: python3-devel
-BuildRequires: meson vala-devel vala-tools pygobject3-devel
+BuildRequires:  glib2-devel
+BuildRequires:  libgit2-devel
+BuildRequires:  libssh2-devel
+BuildRequires:  gobject-introspection-devel
+BuildRequires:  gtk-doc
+BuildRequires:  python3-devel
+BuildRequires:  meson vala-devel vala pygobject3-devel
 
-BuildRoot:  %{_tmppath}/%{name}-%{version}-root
+BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 
 %description
 libgit2-glib is a glib wrapper library around the libgit2 git access library.
@@ -42,7 +36,7 @@ libgit2-glib は GIT アクセス用ライブラリ libgit2 用の glib ラッ
 %package        devel
 Summary:        Development tools for %{name}
 Summary(ja):    %{name} の開発環境
-Group:          Development/Libraries
+Group:          programming
 Requires:       %{name} = %{version}-%{release}
 Requires:       pkgconfig
 
@@ -53,21 +47,26 @@ Header files and libraries for building a extension library for the %{name}.
 %package        docs
 Summary:        Documentation for %{name}
 Summary(ja):    %{name} 用のドキュメント
-Group:          Documentation
+Group:          documentation
 BuildArch:      noarch
 
 %description    docs
 This package contains documentation for %{name}.
 
 
+%debug_package
+
+
 %prep
 %setup -q
-%patch0 -p1
+%autosetup -p1
+
 
 %build
 %meson -Dgtk_doc=true -Dpython=true
 %meson_build
 
+
 %install
 %{__rm} -rf ${RPM_BUILD_ROOT}
 %meson_install
@@ -75,6 +74,7 @@ This package contains documentation for %{name}.
 find ${RPM_BUILD_ROOT} -name '*.a' -exec rm -f {} \;
 find ${RPM_BUILD_ROOT} -name '*.la' -exec rm -f {} \;
 
+
 %check
 %meson_test
 
@@ -82,10 +82,6 @@ find ${RPM_BUILD_ROOT} -name '*.la' -exec rm -f {} \;
 %clean
 %{__rm} -rf ${RPM_BUILD_ROOT}
 
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
 
 %files
 %defattr(-,root,root,-)
@@ -93,7 +89,7 @@ find ${RPM_BUILD_ROOT} -name '*.la' -exec rm -f {} \;
 %doc AUTHORS ChangeLog NEWS README
 %{_libdir}/%{name}-1.0.so.*
 %{_libdir}/girepository-1.0/Ggit-1.0.typelib
-%{python3_sitearch}/gi/overrides/*
+%{python3_sitelib}/gi/overrides/*
 
 %files devel
 %defattr(-,root,root,-)
@@ -110,6 +106,12 @@ find ${RPM_BUILD_ROOT} -name '*.la' -exec rm -f {} \;
 
 
 %changelog
+* Wed Oct 27 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.99.0.1-1
+- new upstream release.
+- dropped ldconfig scriptlets.
+- dropped Patch0.
+- imported Patch0 and 1 from upstream.
+
 * Tue May 05 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.28.0.1-1
 - new upstream release.
 - dropped Patch1.

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

@@ -1,14 +1,14 @@
 Summary:        C implementation of the Git core methods as a library with a solid API 
 Name:           libgit2
-Version:        1.0.0
+Version:        1.3.0
 Release:        1%{?_dist_release}
-Group:          System Environment/Libraries
+Group:          system
 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
+Source0:        https://github.com/libgit2/libgit2/archive/refs/tags/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 BuildRequires:  cmake
@@ -28,7 +28,7 @@ which supports C bindings.
 %package        devel
 Summary:        Development tools for %{name}
 Summary(ja):    %{name} の開発環境
-Group:          Development/Libraries
+Group:          programming
 Requires:       %{name} = %{version}-%{release}
 Requires:       pkgconfig
 Requires:       openssl-devel
@@ -40,34 +40,32 @@ Requires:       zlib-devel
 Header files and libraries for building a extension library for the %{name}.
 
 
+%debug_package
+
+
 %prep
 %setup -q
 
-%build
-rm -rf build && mkdir build && pushd build
-%cmake -DINSTALL_DOCS=OFF \
-    ../
 
-make %{?_smp_mflags}
-popd
+%build
+%cmake -DINSTALL_DOCS=OFF
+%cmake_build
 
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
-pushd build
-make install DESTDIR=${RPM_BUILD_ROOT}
-popd
+%cmake_install
 
 find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} \;
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \;
 
 
-%clean
-%{__rm} -rf ${RPM_BUILD_ROOT}
+%check
+%ctest
 
-%post -p /sbin/ldconfig
 
-%postun -p /sbin/ldconfig
+%clean
+%{__rm} -rf ${RPM_BUILD_ROOT}
 
 
 %files
@@ -85,6 +83,10 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \;
 
 
 %changelog
+* Wed Oct 27 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.3.0-1
+- new upstream release.
+- dropped ldconfig scriptlets.
+
 * Tue May 05 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.0.0-1
 - new upstream release.