Compare commits

...

No commits in common. 'i9cf' and 'i10fe' have entirely different histories.
i9cf ... i10fe

4
.gitignore vendored

@ -1,2 +1,2 @@
SOURCES/utfcpp-3.2.1.tar.gz
SOURCES/ftest-9c7e60c.tar.gz
SOURCES/utfcpp-4.0.5.tar.gz
SOURCES/ftest-c4ad4af.tar.gz

@ -1,2 +1,2 @@
04c614fc761a03de239fd290760800dc26091046 SOURCES/utfcpp-3.2.1.tar.gz
5f659cb2b4d5a08644df5fba84b506e8cb4092fe SOURCES/ftest-9c7e60c.tar.gz
8355e839e4261f7768549842500c8eb8fea8b397 SOURCES/utfcpp-4.0.5.tar.gz
967a1695b35aa8382a4ad7853c535965c9eb9ad1 SOURCES/ftest-c4ad4af.tar.gz

@ -0,0 +1,24 @@
diff -up utfcpp-4.0.4/CMakeLists.txt.orig utfcpp-4.0.4/CMakeLists.txt
--- utfcpp-4.0.4/CMakeLists.txt.orig 2023-12-10 16:42:20.000000000 +0100
+++ utfcpp-4.0.4/CMakeLists.txt 2023-12-14 12:37:01.511860031 +0100
@@ -35,17 +35,17 @@ install(TARGETS ${PROJECT_NAME}
configure_package_config_file(
"${PROJECT_SOURCE_DIR}/${PROJECT_NAME}Config.cmake.in"
"${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
- INSTALL_DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}/cmake
+ INSTALL_DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/cmake/${PROJECT_NAME}
)
install(EXPORT ${PROJECT_NAME}Targets
FILE ${PROJECT_NAME}Targets.cmake
NAMESPACE ${PROJECT_NAME}::
- DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}/cmake)
+ DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/cmake/${PROJECT_NAME})
install(FILES "${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
"${PROJECT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake"
- DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}/cmake)
+ DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/cmake/${PROJECT_NAME})
install(FILES ${PROJECT_SOURCE_DIR}/source/utf8.h DESTINATION include/utf8cpp)
install(DIRECTORY ${PROJECT_SOURCE_DIR}/source/utf8 DESTINATION

@ -1,12 +0,0 @@
diff -up utfcpp-3.1/CMakeLists.txt.noarch utfcpp-3.1/CMakeLists.txt
--- utfcpp-3.1/CMakeLists.txt.noarch 2019-10-22 09:52:44.918701226 +0200
+++ utfcpp-3.1/CMakeLists.txt 2019-10-22 09:51:52.374148428 +0200
@@ -17,7 +17,7 @@ if(UTF8_INSTALL)
set(DEF_INSTALL_CMAKE_DIR CMake)
else()
include(GNUInstallDirs) # define CMAKE_INSTALL_*
- set(DEF_INSTALL_CMAKE_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/utf8cpp)
+ set(DEF_INSTALL_CMAKE_DIR ${CMAKE_INSTALL_DATADIR}/cmake/utf8cpp)
endif()
install(DIRECTORY source/ DESTINATION include/utf8cpp)

@ -1,20 +1,20 @@
%undefine __cmake_in_source_build
# This package only contains header files.
%global debug_package %{nil}
%global ftest_commit 9c7e60cc1b7c76f59e2ffbbc3dad15bafc5cdac5
%global ftest_commit c4ad4af0946b73ce1a40cbc72205d15d196c7e06
%global ftest_shortcommit %(c=%{ftest_commit}; echo ${c:0:7})
Name: utf8cpp
Version: 3.2.1
Version: 4.0.5
Release: 3%{?dist}
Summary: A simple, portable and lightweight library for handling UTF-8 encoded strings
License: Boost
License: BSL-1.0
URL: https://github.com/nemtrif/utfcpp
Source0: https://github.com/nemtrif/utfcpp/archive/v%{version}/utfcpp-%{version}.tar.gz
Source1: https://github.com/nemtrif/ftest/archive/%{ftest_commit}/ftest-%{ftest_shortcommit}.tar.gz
# put cmake import file in arch-agnostic directory
Patch1: %{name}-noarch.patch
BuildRequires: cmake3
# put cmake import file in correct directory
Patch0: %{name}-cmake.patch
BuildRequires: cmake
BuildRequires: gcc-c++
%description
@ -46,45 +46,83 @@ This project currently only contains header files, which can be found in the
%{name}-devel package.
%prep
%setup -q -n utfcpp-%{version} -a1
%autosetup -n utfcpp-%{version} -a1 -p1
rmdir extern/ftest && mv ftest-%{ftest_commit} extern/ftest
%patch1 -p1 -b .noarch
%build
%cmake3 \
-DUTF8_TESTS=ON \
-DUTF8_SAMPLES=ON \
%cmake \
%{nil}
%cmake3_build
%cmake_build
pushd tests
%cmake
%cmake_build
popd
%install
%cmake3_install
%cmake_install
pushd %{buildroot}%{_includedir}
ln -s utf8cpp/utf8.h ./
mkdir utf8
for f in {{un,}checked,core,cpp11,cpp17}.h ; do
for f in {{un,}checked,core,cpp{11,17,20}}.h ; do
ln -s ../utf8cpp/utf8/${f} utf8/
done
popd
%check
pushd tests
%ctest
popd
%files devel
%doc README.md samples/docsample.cpp
%doc README.md
%license LICENSE
%{_includedir}/utf8.h
%dir %{_includedir}/utf8
%{_includedir}/utf8/checked.h
%{_includedir}/utf8/core.h
%{_includedir}/utf8/cpp11.h
%{_includedir}/utf8/cpp17.h
%{_includedir}/utf8/cpp20.h
%{_includedir}/utf8/unchecked.h
%{_includedir}/utf8cpp
%{_datadir}/cmake/utf8cpp
%changelog
* Wed Feb 07 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 3.2.1-3
- Rebuilt for MSVSphere 9.3
* Sun Dec 29 2024 Dmitriy Samoylik <samoylikdv@msvsphere-os.ru> - 4.0.5-3
- Rebuilt for MSVSphere 10
* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.5-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.5-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Wed Jan 03 2024 Dominik Mierzejewski <dominik@greysector.net> - 4.0.5-1
- update to 4.0.5 (resolves rhbz#2245744)
- include license text
* Sun Oct 08 2023 Dominik Mierzejewski <dominik@greysector.net> - 3.2.5-1
- update to 3.2.5 (resolves rhbz#2240785)
* Thu Aug 31 2023 Dominik Mierzejewski <dominik@greysector.net> - 3.2.4-1
- update to 3.2.4 (resolves rhbz#2231660)
- switch to SPDX expression in License tag
- use modern autosetup and plain cmake dependency and macros
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.3-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Tue Jan 03 2023 Dominik 'Rathann' Mierzejewski <dominik@greysector.net> - 3.2.3-1
- update to 3.2.3 (#2157206)
* Wed Dec 07 2022 Dominik 'Rathann' Mierzejewski <dominik@greysector.net> - 3.2.2-1
- update to 3.2.2 (#2140879)
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

Loading…
Cancel
Save