diff --git a/.gitignore b/.gitignore index 021d9d3..01a812e 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/workflow-*.tar.gz +/workflow-0.10.6.tar.gz diff --git a/.packit.yaml b/.packit.yaml deleted file mode 100644 index e72368a..0000000 --- a/.packit.yaml +++ /dev/null @@ -1,26 +0,0 @@ -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 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 7158b93..0000000 --- a/packit.yaml +++ /dev/null @@ -1,19 +0,0 @@ -upstream_project_url: https://github.com/sogou/workflow -upstream_tag_template: v{version} -create_sync_note: false - -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 fd21aaa..80aa75d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (workflow-1.1.0.tar.gz) = 366713a1e8f0394e9585e834705892eec362d4949aa71a50c2130a819b8cf993ebcae2d8ba474ac66766a114520893107233d64364694aab56d094114ae6730d +SHA512 (workflow-0.10.6.tar.gz) = b454407804bbdf38a8c03e7780791b30a9564b0e4471509fa283859b081ff530584a31dff9c53bfb89b005cdda55e5061b2d2ca6dbbd450e3a5790b6df1b8037 diff --git a/workflow.spec b/workflow.spec index 5734054..b4811a6 100644 --- a/workflow.spec +++ b/workflow.spec @@ -7,26 +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: 1.1.0 -Release: %autorelease +Version: 0.10.6 +Release: 1%{?dist} URL: https://github.com/sogou/workflow Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz 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 @@ -53,7 +49,7 @@ BuildArch: noarch %_description %prep -%autosetup -p1 +%autosetup # Rename files to make installation of documentation easier pushd docs pushd en @@ -64,7 +60,7 @@ popd %build -%cmake -GNinja +%cmake %cmake_build # remove copies of header files to minimize # size of debugsource package, these files are @@ -101,8 +97,8 @@ make check %license LICENSE LICENSE_GPLV2 %doc README.md %doc README_cn.md -%{_libdir}/libworkflow.so.1.* -%{_libdir}/libworkflow.so.1 +%{_libdir}/libworkflow.so.0.* +%{_libdir}/libworkflow.so.0 %files devel %{_libdir}/libworkflow.so @@ -119,4 +115,28 @@ make check %changelog -%autochangelog +* 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