From ea373ce9bb624a069ba173d5cd94008ea54cf8e6 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 26 Jun 2023 14:43:37 +0200 Subject: update to 0.8.7 rename to sexpp --- sexp-files-by-license.txt | 41 -------------- sexp.spec | 126 ------------------------------------------- sexpp-files-by-license.txt | 41 ++++++++++++++ sexpp.spec | 130 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 171 insertions(+), 167 deletions(-) delete mode 100644 sexp-files-by-license.txt delete mode 100644 sexp.spec create mode 100644 sexpp-files-by-license.txt create mode 100644 sexpp.spec diff --git a/sexp-files-by-license.txt b/sexp-files-by-license.txt deleted file mode 100644 index ed476a2..0000000 --- a/sexp-files-by-license.txt +++ /dev/null @@ -1,41 +0,0 @@ - -MIT License ------------- -CMakeLists.txt -CMakeLists.txt.sover -LICENSE.md -codecov.yml -default.nix -flake.nix -cmake/sexp-samples-folder.h.in -cmake/version.cmake -src/ext-key-format.cpp -src/sexp-char-defs.cpp -src/sexp-depth-manager.cpp -src/sexp-error.cpp -src/sexp-input.cpp -src/sexp-main.cpp -src/sexp-object.cpp -src/sexp-output.cpp -src/sexp-simple-string.cpp -.github/workflows/build-and-test-deb.yml -.github/workflows/build-and-test-msys.yml -.github/workflows/build-and-test-rh.yml -.github/workflows/build-and-test.yml -.github/workflows/codeql.yml -.github/workflows/coverage.yml -.github/workflows/coverity.yml -.github/workflows/lint.yml -.github/workflows/nix.yml -include/sexp/ext-key-format.h -include/sexp/sexp-error.h -include/sexp/sexp.h -tests/include/sexp-tests.h -tests/scripts/tests.sh -tests/src/baseline-tests.cpp -tests/src/compare-files.cpp -tests/src/exception-tests.cpp -tests/src/g10-compat-tests.cpp -tests/src/g23-compat-tests.cpp -tests/src/g23-exception-tests.cpp -tests/src/primitives-tests.cpp diff --git a/sexp.spec b/sexp.spec deleted file mode 100644 index 9382686..0000000 --- a/sexp.spec +++ /dev/null @@ -1,126 +0,0 @@ -# remirepo/fedora spec file for sexp -# -# Copyright (c) 2023 Remi Collet -# License: CC-BY-SA-4.0 -# http://creativecommons.org/licenses/by-sa/4.0/ -# -# Please, preserve the changelog entries -# - -%bcond_without tests -%bcond_with licensecheck - -%global libname libsexp -%global soname 0 - -Name: sexp -Summary: S-expressions parser and generator tools -Version: 0.8.6 -Release: 1%{?dist} -License: MIT - -URL: https://github.com/rnpgp/%{name} -Source0: %{url}/archive/refs/tags/v%{version}.tar.gz -# Use --with licensecheck to generate -Source3: %{name}-files-by-license.txt - -BuildRequires: cmake >= 3.14 -BuildRequires: gcc -BuildRequires: gcc-c++ -%if 0%{?rhel} == 8 -BuildRequires: gtest-devel -%else -BuildRequires: cmake(GTest) -%endif -%if %{with licensecheck} -BuildRequires: licensecheck -%endif - -Requires: %{libname}%{?_isa} = %{version}-%{release} - - -%description -S-expressions parser and generator tools. - - -%package -n %{libname} -Summary: S-expressions parser and generator library - -%description -n %{libname} -%{libname} is a C++ library for working with S-expressions. - -This implementation is derived from the reference SEXP C library developed by -Professors Ronald Rivest and Butler Lampson of MIT LCS (now CSAIL). - - - -%package -n %{libname}-devel -Summary: Header files and development libraries for %{libname} -Requires: %{libname}%{?_isa} = %{version}-%{release} - -%description -n %{libname}-devel -This package contains the header files and development libraries -for %{libname}. - - -%prep -%setup -q - -%if %{with licensecheck} -LST=$(mktemp) - -licensecheck -r . | sed -e 's:^./::' >$LST -grep -v UNKNOWN $LST | sed -e 's/.*: //' | sort -u | while read lic -do - echo -e "\n$lic\n------------" - grep ": $lic\$" $LST | sed -e "s/: $lic//" -done | tee %{SOURCE3} -rm $LST -%endif - - -%build -%cmake . \ - -DBUILD_SHARED_LIBS:BOOL=ON \ - -DDOWNLOAD_GTEST:BOOL=OFF - -%cmake_build - - -%install -%cmake_install - - -%if %{with tests} -%check -%ctest -%endif - - -%files -%{_bindir}/%{name} -%{_mandir}/man1/%{name}.1* - -%files -n %{libname} -%license LICENSE* -%{_libdir}/%{libname}.so.%{soname}* - -%files -n %{libname}-devel -%{_includedir}/%{name} -%{_libdir}/%{libname}.so -%{_libdir}/pkgconfig/%{name}.pc - - -%changelog -* Fri Jun 23 2023 Remi Collet - 0.8.6-1 -- update to 0.8.6 -- drop patch merged upstream - -* Wed Jun 21 2023 Remi Collet - 0.8.5-1 -- update to 0.8.5 -- open https://github.com/rnpgp/sexp/pull/37 define SOVERSION - -* Thu May 4 2023 Remi Collet - 0.8.4-1 -- initial package -- open https://github.com/rnpgp/sexp/issues/32 build as shared -- open https://github.com/rnpgp/sexp/issues/33 clarify license diff --git a/sexpp-files-by-license.txt b/sexpp-files-by-license.txt new file mode 100644 index 0000000..2d5c8eb --- /dev/null +++ b/sexpp-files-by-license.txt @@ -0,0 +1,41 @@ + +MIT License +------------ +CMakeLists.txt +LICENSE.md +codecov.yml +default.nix +flake.nix +cmake/sexp-samples-folder.h.in +cmake/version.cmake +src/ext-key-format.cpp +src/sexp-char-defs.cpp +src/sexp-depth-manager.cpp +src/sexp-error.cpp +src/sexp-input.cpp +src/sexp-main.cpp +src/sexp-object.cpp +src/sexp-output.cpp +src/sexp-simple-string.cpp +.github/workflows/build-and-test-deb.yml +.github/workflows/build-and-test-msys.yml +.github/workflows/build-and-test-rh.yml +.github/workflows/build-and-test.yml +.github/workflows/codeql.yml +.github/workflows/coverage.yml +.github/workflows/coverity.yml +.github/workflows/lint.yml +.github/workflows/nix.yml +include/sexpp/ext-key-format.h +include/sexpp/sexp-error.h +include/sexpp/sexp-public.h +include/sexpp/sexp.h +tests/include/sexp-tests.h +tests/scripts/tests.sh +tests/src/baseline-tests.cpp +tests/src/compare-files.cpp +tests/src/exception-tests.cpp +tests/src/g10-compat-tests.cpp +tests/src/g23-compat-tests.cpp +tests/src/g23-exception-tests.cpp +tests/src/primitives-tests.cpp diff --git a/sexpp.spec b/sexpp.spec new file mode 100644 index 0000000..669e308 --- /dev/null +++ b/sexpp.spec @@ -0,0 +1,130 @@ +# remirepo/fedora spec file for sexpp +# +# Copyright (c) 2023 Remi Collet +# License: CC-BY-SA-4.0 +# http://creativecommons.org/licenses/by-sa/4.0/ +# +# Please, preserve the changelog entries +# + +%bcond_without tests +%bcond_with licensecheck + +%global libname libsexpp +%global soname 0 + +Name: sexpp +Summary: S-expressions parser and generator tools +Version: 0.8.7 +Release: 1%{?dist} +License: MIT + +URL: https://github.com/rnpgp/%{name} +Source0: %{url}/archive/refs/tags/v%{version}.tar.gz +# Use --with licensecheck to generate +Source3: %{name}-files-by-license.txt + +BuildRequires: cmake >= 3.14 +BuildRequires: gcc +BuildRequires: gcc-c++ +%if 0%{?rhel} == 8 +BuildRequires: gtest-devel +%else +BuildRequires: cmake(GTest) +%endif +%if %{with licensecheck} +BuildRequires: licensecheck +%endif + +Requires: %{libname}%{?_isa} = %{version}-%{release} + + +%description +S-expressions parser and generator tools. + + +%package -n %{libname} +Summary: S-expressions parser and generator library + +%description -n %{libname} +%{libname} is a C++ library for working with S-expressions. + +This implementation is derived from the reference SEXP C library developed by +Professors Ronald Rivest and Butler Lampson of MIT LCS (now CSAIL). + + + +%package -n %{libname}-devel +Summary: Header files and development libraries for %{libname} +Requires: %{libname}%{?_isa} = %{version}-%{release} + +%description -n %{libname}-devel +This package contains the header files and development libraries +for %{libname}. + + +%prep +%setup -q + +%if %{with licensecheck} +LST=$(mktemp) + +licensecheck -r . | sed -e 's:^./::' >$LST +grep -v UNKNOWN $LST | sed -e 's/.*: //' | sort -u | while read lic +do + echo -e "\n$lic\n------------" + grep ": $lic\$" $LST | sed -e "s/: $lic//" +done | tee %{SOURCE3} +rm $LST +%endif + + +%build +%cmake . \ + -DBUILD_SHARED_LIBS:BOOL=ON \ + -DDOWNLOAD_GTEST:BOOL=OFF + +%cmake_build + + +%install +%cmake_install + + +%if %{with tests} +%check +%ctest +%endif + + +%files +%{_bindir}/%{name} +%{_mandir}/man1/%{name}.1* + +%files -n %{libname} +%license LICENSE* +%{_libdir}/%{libname}.so.%{soname}* + +%files -n %{libname}-devel +%{_includedir}/%{name} +%{_libdir}/%{libname}.so +%{_libdir}/pkgconfig/%{name}.pc + + +%changelog +* Mon Jun 26 2023 Remi Collet - 0.8.7-1 +- update to 0.8.7 +- rename to sexpp + +* Fri Jun 23 2023 Remi Collet - 0.8.6-1 +- update to 0.8.6 +- drop patch merged upstream + +* Wed Jun 21 2023 Remi Collet - 0.8.5-1 +- update to 0.8.5 +- open https://github.com/rnpgp/sexp/pull/37 define SOVERSION + +* Thu May 4 2023 Remi Collet - 0.8.4-1 +- initial package +- open https://github.com/rnpgp/sexp/issues/32 build as shared +- open https://github.com/rnpgp/sexp/issues/33 clarify license -- cgit