diff --git a/.gitignore b/.gitignore index 194b118..f7a0c90 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,12 @@ /workflow-0.10.6.tar.gz /workflow-0.10.7.tar.gz +/workflow-0.11.1.tar.gz +/workflow-0.11.3.tar.gz +/workflow-0.11.4.tar.gz +/workflow-0.11.5.tar.gz +/workflow-0.11.6.tar.gz +/workflow-0.11.7.tar.gz +/workflow-0.11.8.tar.gz +/workflow-0.11.9.tar.gz +/workflow-0.11.10.tar.gz +/workflow-0.11.11.tar.gz diff --git a/.packit.yaml b/.packit.yaml new file mode 100644 index 0000000..e72368a --- /dev/null +++ b/.packit.yaml @@ -0,0 +1,26 @@ +specfile_path: workflow.spec + +upstream_package_name: workflow +upstream_project_url: https://github.com/sogou/workflow/ +downstream_package_name: workflow +upstream_tag_template: v{version} + +jobs: + +- job: pull_from_upstream + trigger: release + dist_git_branches: + - fedora-rawhide + actions: + changelog-entry: + - bash -c 'echo "- New release ${PACKIT_PROJECT_VERSION}"' + +- job: koji_build + trigger: commit + dist_git_branches: + - fedora-rawhide + +- job: bodhi_update + trigger: release + dist_git_branches: + - fedora-branched diff --git a/README.packit b/README.packit new file mode 100644 index 0000000..dde2a46 --- /dev/null +++ b/README.packit @@ -0,0 +1,3 @@ +This repository is maintained by packit. +https://packit.dev/ +The file was generated using packit 1.9.0.post1.dev4+g48b4c222. diff --git a/changelog b/changelog new file mode 100644 index 0000000..ee51611 --- /dev/null +++ b/changelog @@ -0,0 +1,37 @@ +* Sat Jan 27 2024 Fedora Release Engineering - 0.11.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sat Nov 11 2023 Benson Muite - 0.11.1-1 +- Update to new release + +* Sat Jul 22 2023 Fedora Release Engineering - 0.10.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Tue Jun 6 2023 Benson Muite - 0.10.7-1 +- Update to new release + +* Sat Feb 25 2023 Benson Muite - 0.10.6-1 +- Update to new release + +* Thu Feb 23 2023 Benson Muite - 0.10.5-4 +- Get tests to work +- Add redis and valgrind +- Use GTest with c++14 + +* Wed Feb 22 2023 Benson Muite - 0.10.5-3 +- Remove static library rather than use exclude macro +- Use tutorial instead of tests + +* Fri Jan 13 2023 Benson Muite - 0.10.5-2 +- Ensure tests run + +* Wed Jan 11 2023 Benson Muite - 0.10.5-1 +- Version update +- Add copy of GPL license + +* Mon Jan 02 2023 Benson Muite - 0.10.4-2 +- Do not include static library +- Update license information + +* Sun Jan 01 2023 Benson Muite - 0.10.4-1 +- Initial packaging diff --git a/packit.yaml b/packit.yaml new file mode 100644 index 0000000..8f2b6e4 --- /dev/null +++ b/packit.yaml @@ -0,0 +1,18 @@ +upstream_project_url: https://github.com/sogou/workflow +upstream_tag_template: v{version} + +jobs: + - job: pull_from_upstream + trigger: release + dist_git_branches: + - fedora-rawhide + + - job: koji_build + trigger: commit + dist_git_branches: + - fedora-all + + - job: bodhi_update + trigger: commit + dist_git_branches: + - fedora-all diff --git a/sources b/sources index 60a639a..5b49a4b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (workflow-0.10.7.tar.gz) = 42f675ed262f6e12e0dd6b0cbcadc6ccafb296684e1119385868142ed643d27f71d3b79f68b84b77f5b3ac0615442a76651d9a41457baa36662da16476672ce8 +SHA512 (workflow-0.11.11.tar.gz) = 78996029efd23ca7843f4089d801729174bf8e6bcb1babbe6f557db0c0b4094069dce38328332ddcddffec6710e77cfd03110264d0c670b8cd42b23dda5061ed diff --git a/workflow-0.11.10-test-c++17.patch b/workflow-0.11.10-test-c++17.patch new file mode 100644 index 0000000..015bea9 --- /dev/null +++ b/workflow-0.11.10-test-c++17.patch @@ -0,0 +1,13 @@ +diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt +index 963d838..d168d31 100644 +--- a/test/CMakeLists.txt ++++ b/test/CMakeLists.txt +@@ -20,7 +20,7 @@ add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND}) + + enable_testing() + +-set(CXX_STD "c++14") ++set(CXX_STD "c++17") + + find_package(GTest REQUIRED) + diff --git a/workflow.spec b/workflow.spec index 5d7d697..429c63f 100644 --- a/workflow.spec +++ b/workflow.spec @@ -7,22 +7,27 @@ Name: workflow # src/kernel/rbtree.h available under GPL-2.0-or-later License: Apache-2.0 AND BSD-2-Clause AND Zlib AND GPL-2.0-or-later -Version: 0.10.7 -Release: 1%{?dist} +Version: 0.11.11 +Release: %autorelease URL: https://github.com/sogou/workflow Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz +Patch: workflow-0.11.10-test-c++17.patch BuildRequires: cmake BuildRequires: gcc-c++ +BuildRequires: ninja-build BuildRequires: gtest-devel -BuildRequires: make BuildRequires: openssl-devel +%ifnarch %{ix86} # Needed for redis check BuildRequires: redis +%endif BuildRequires: sed # Needed for memory check +%ifarch %{valgrind_arches} BuildRequires: valgrind +%endif %global _description %{expand: As Sogou`s C++ server engine, Sogou C++ Workflow supports almost all back-end @@ -49,7 +54,7 @@ BuildArch: noarch %_description %prep -%autosetup +%autosetup -p1 # Rename files to make installation of documentation easier pushd docs pushd en @@ -60,7 +65,7 @@ popd %build -%cmake +%cmake -GNinja %cmake_build # remove copies of header files to minimize # size of debugsource package, these files are @@ -115,31 +120,4 @@ make check %changelog -* Tue Jun 6 2023 Benson Muite - 0.10.7-1 -- Update to new release - -* Sat Feb 25 2023 Benson Muite - 0.10.6-1 -- Update to new release - -* Thu Feb 23 2023 Benson Muite - 0.10.5-4 -- Get tests to work -- Add redis and valgrind -- Use GTest with c++14 - -* Wed Feb 22 2023 Benson Muite - 0.10.5-3 -- Remove static library rather than use exclude macro -- Use tutorial instead of tests - -* Fri Jan 13 2023 Benson Muite - 0.10.5-2 -- Ensure tests run - -* Wed Jan 11 2023 Benson Muite - 0.10.5-1 -- Version update -- Add copy of GPL license - -* Mon Jan 02 2023 Benson Muite - 0.10.4-2 -- Do not include static library -- Update license information - -* Sun Jan 01 2023 Benson Muite - 0.10.4-1 -- Initial packaging +%autochangelog