diff --git a/.gitignore b/.gitignore index f7a0c90..2c7fd6e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,12 +1,3 @@ /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 index e72368a..fa9f8ee 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -1,4 +1,7 @@ specfile_path: workflow.spec +files_to_sync: + - workflow.spec + - .packit.yaml upstream_package_name: workflow upstream_project_url: https://github.com/sogou/workflow/ diff --git a/README.packit b/README.packit deleted file mode 100644 index dde2a46..0000000 --- a/README.packit +++ /dev/null @@ -1,3 +0,0 @@ -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 deleted file mode 100644 index ee51611..0000000 --- a/changelog +++ /dev/null @@ -1,37 +0,0 @@ -* 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 deleted file mode 100644 index 8f2b6e4..0000000 --- a/packit.yaml +++ /dev/null @@ -1,18 +0,0 @@ -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 5b49a4b..2e1206e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (workflow-0.11.11.tar.gz) = 78996029efd23ca7843f4089d801729174bf8e6bcb1babbe6f557db0c0b4094069dce38328332ddcddffec6710e77cfd03110264d0c670b8cd42b23dda5061ed +SHA512 (workflow-0.11.1.tar.gz) = d613465dfed6e3c69bc2cf73a18c0ef5c5a4fe63ade4e24efd5400e78eeeebaae475af5bda105d57cf3c5be993c2aee7506e9244816abcc7c234d17fc1caca2a diff --git a/workflow-0.11.10-test-c++17.patch b/workflow-0.11.10-test-c++17.patch deleted file mode 100644 index 015bea9..0000000 --- a/workflow-0.11.10-test-c++17.patch +++ /dev/null @@ -1,13 +0,0 @@ -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 429c63f..fdd47dc 100644 --- a/workflow.spec +++ b/workflow.spec @@ -7,27 +7,22 @@ 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.11.11 -Release: %autorelease +Version: 0.11.1 +Release: 1%{?dist} 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 @@ -54,7 +49,7 @@ BuildArch: noarch %_description %prep -%autosetup -p1 +%autosetup # Rename files to make installation of documentation easier pushd docs pushd en @@ -65,7 +60,7 @@ popd %build -%cmake -GNinja +%cmake %cmake_build # remove copies of header files to minimize # size of debugsource package, these files are @@ -120,4 +115,37 @@ make check %changelog -%autochangelog +* 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