Ver Fonte

updated 2 packages

gtest-1.14.0-1

tmux-3.4-1
Tomohiro "Tomo-p" KATO há 8 meses atrás
pai
commit
b42a8bb064
2 ficheiros alterados com 36 adições e 56 exclusões
  1. 30 53
      g/gtest/gtest-vl.spec
  2. 6 3
      t/tmux/tmux-vl.spec

+ 30 - 53
g/gtest/gtest-vl.spec

@@ -1,27 +1,15 @@
 Summary:	Google C++ testing framework
 Summary(ja):	Google C++ テスティングフレームワーク
 Name:		gtest
-Version:	1.8.1
+Version:	1.14.0
 Release:	1%{?_dist_release}
-License:	New BSD
-Group:		Development/Tools
-URL:		https://github.com/google/googletest
-
 Vendor:		Project Vine
 Distribution:	Vine Linux
 
-Source0:	https://github.com/google/googletest/archive/release-%{version}.tar.gz
-
-# https://github.com/google/googletest/pull/967
-Patch0:         gtest-1.8.1-null-pointer.patch
-# https://github.com/google/googletest/pull/1839
-Patch1:         gtest-PR1839-Fix-Python3-support.patch
-# Fedora-specific patches
-## Set libversion for libraries to version of gtest
-Patch100:       gtest-1.8.1-libversion.patch
-## Add missing pkgconfig requires information to reflect reality
-Patch101:       gtest-1.8.1-add-missing-pkgconfig-requires.patch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-root
+License:	BSD-3-Clause and Apache-2.0
+Group:		programming
+URL:		https://github.com/google/googletest
+Source0:	https://github.com/google/googletest/archive/refs/tags/v%{version}.tar.gz
 
 BuildRequires:  cmake
 BuildRequires:  python3-devel
@@ -35,20 +23,20 @@ assertions, death tests, fatal and non-fatal failures, various options for
 running the tests, and XML test report generation.
 
 
-%package devel
+%package	devel
 Summary:	Development files for %{name}
 Summary(ja):	%{name} の開発ファイル
-Group:		Development/Libraries
+Group:		programming
 Requires:	%{name} = %{version}-%{release}
 
 %description devel
 This package contains development files for %{name}.
 
 
-%package     -n gmock
-Summary:        Google C++ Mocking Framework
-Group:          Development/Tools
-Requires:       %{name} = %{version}-%{release}
+%package	-n gmock
+Summary:	Google C++ Mocking Framework
+Group:		programming
+Requires:	%{name} = %{version}-%{release}
 
 %description -n gmock
 Inspired by jMock, EasyMock, and Hamcrest, and designed with C++s
@@ -66,62 +54,48 @@ Google Mock:
    Symbian.
 
 
-%package     -n gmock-devel
-Summary:        Development files for gmock
-Group:          Development/Libraries
-Requires:       gmock = %{version}-%{release}
+%package	-n gmock-devel
+Summary:	Development files for gmock
+Group:		programming
+Requires:	gmock = %{version}-%{release}
 
 %description -n gmock-devel
 This package contains development files for gmock.
 
 
 %prep
-%autosetup -p1 -n googletest-release-%{version}
+%autosetup -p1 -n googletest-%{version}
 
 # Set the version correctly
 sed -e "s/set(GOOGLETEST_VERSION .*)/set(GOOGLETEST_VERSION %{version})/" -i CMakeLists.txt
 
 
 %build
-mkdir build && cd build
 %cmake -DBUILD_SHARED_LIBS=ON \
        -DPYTHON_EXECUTABLE=%{__python3} \
-       -Dgtest_build_tests=ON ..
-%make_build
+       -Dgtest_build_tests=ON
+%cmake_build
 
 
 %install
-cd build
-%make_install
+%cmake_install
 
 
 %check
-cd build
-make test
-
+%ctest
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
-%post -n gmock -p /sbin/ldconfig
-
-%postun -n gmock -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root,-)
-%license googletest/LICENSE
+%license LICENSE
 %{_libdir}/libgtest.so.%{version}
 %{_libdir}/libgtest_main.so.%{version}
 
 %files devel
 %defattr(-,root,root,-)
-%doc googletest/{CHANGES,CONTRIBUTORS,README.md}
-%doc googletest/docs/
-%doc googletest/samples
+%doc CONTRIBUTORS README.md
+%doc docs/
+%doc samples
 %{_includedir}/gtest/
 %{_libdir}/libgtest.so
 %{_libdir}/libgtest_main.so
@@ -130,13 +104,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/gtest_main.pc
 
 %files -n gmock
-%license googlemock/LICENSE
+%license LICENSE
 %{_libdir}/libgmock.so.%{version}
 %{_libdir}/libgmock_main.so.%{version}
 
 %files -n gmock-devel
-%doc googlemock/{CHANGES,CONTRIBUTORS,README.md}
-%doc googlemock/docs/
+%doc CONTRIBUTORS README.md
+%doc docs/
 %{_includedir}/gmock/
 %{_libdir}/libgmock.so
 %{_libdir}/libgmock_main.so
@@ -145,6 +119,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Apr 09 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.14.0-1
+- new upstream release.
+
 * Wed Sep 11 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.8.1-1
 - new upstream release.
 - dropped Patch0.

+ 6 - 3
t/tmux/tmux-vl.spec

@@ -1,7 +1,7 @@
 Summary:        A terminal multiplexer
 Name:           tmux
-Version:        3.3a
-Release:        2%{?_dist_release}
+Version:        3.4
+Release:        1%{?_dist_release}
 Group:          accessories
 Vendor:         Project Vine
 Distribution:   Vine Linux
@@ -11,7 +11,6 @@ Distribution:   Vine Linux
 License:        ISC and BSD
 URL:            https://github.com/tmux/tmux
 Source0:        https://github.com/tmux/tmux/releases/download/%{version}/tmux-%{version}.tar.gz
-Patch1:         3.3a-master.patch
 
 BuildRequires:  ncurses-devel
 BuildRequires:  libevent-devel
@@ -59,6 +58,10 @@ fi
 
 
 %changelog
+* Tue Apr 09 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.4-1
+- new upstream release.
+- dropped Patch1.
+
 * Sat Apr 29 2023 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.3a-2
 - imported Patch1 from upstream for ncurses-6.4.