diff --git a/.gitignore b/.gitignore index cb770b8..3f42479 100644 --- a/.gitignore +++ b/.gitignore @@ -7,9 +7,3 @@ zint-2.3.2.src.tar.gz /zint-2.6.1.src.tar.gz /zint-2.6.2.src.tar.gz /zint-2.6.6.tar.gz -/zint-2.9.1-src.tar.gz -/zint-2.10.0-src.tar.gz -/zint-2.11.0-src.tar.gz -/zint-2.12.0-src.tar.gz -/zint-2.13.0-src.tar.gz -/zint-2.15.0-src.tar.gz diff --git a/sources b/sources index 4530847..e36e8e4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zint-2.15.0-src.tar.gz) = 7b5f44837a3a16637be5871ce848747ef520d623d86c88602c4ba8f0fe76705836ccee67a83e7ad0544e56b041dadbe88c5ed0b3219946be924213be18d74e2a +SHA512 (zint-2.6.6.tar.gz) = a8af614da6793d1cea886ba9c9649232c51457a0707be911180c41942698ccf20b95ebc90abf0d741253be1dea877698ce418023498134d42885b2e6a81291eb diff --git a/zint-kix-leak.patch b/zint-kix-leak.patch new file mode 100644 index 0000000..8e91ac9 --- /dev/null +++ b/zint-kix-leak.patch @@ -0,0 +1,12 @@ +diff --git a/backend/postal.c b/backend/postal.c +--- a/backend/postal.c ++++ b/backend/postal.c +@@ -363,7 +363,7 @@ + /* Handles Dutch Post TNT KIX symbols */ + /* The same as RM4SCC but without check digit */ + /* Specification at http://www.tntpost.nl/zakelijk/klantenservice/downloads/kIX_code/download.aspx */ +- char height_pattern[50], localstr[20]; ++ char height_pattern[256], localstr[20]; + unsigned int loopey; + int writer, i, h; + int error_number; /* zeroes; */ diff --git a/zint-rpath.patch b/zint-rpath.patch new file mode 100644 index 0000000..02f5e7b --- /dev/null +++ b/zint-rpath.patch @@ -0,0 +1,23 @@ +diff -r 4b4f7dca5ce2 SetPaths.cmake +--- a/SetPaths.cmake Sun May 30 14:28:22 2010 +0200 ++++ b/SetPaths.cmake Sun May 30 14:29:28 2010 +0200 +@@ -237,19 +237,3 @@ + set(CMAKE_BUILD_TYPE RelWithDebInfo) + endif (NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE) + +- +- +-# setup default RPATH/install_name handling, may be overridden by KDE4_HANDLE_RPATH_FOR_[LIBRARY|EXECUTABLE] +-# default is to build with RPATH for the install dir, so it doesn't need to relink +-if (UNIX) +- if (APPLE) +- set(CMAKE_INSTALL_NAME_DIR ${LIB_INSTALL_DIR}) +- else (APPLE) +- # add our LIB_INSTALL_DIR to the RPATH and use the RPATH figured out by cmake when compiling +- set(CMAKE_INSTALL_RPATH ${LIB_INSTALL_DIR} ) +- set(CMAKE_SKIP_BUILD_RPATH TRUE) +- set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) +- set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) +- endif (APPLE) +-endif (UNIX) +- diff --git a/zint-shared.patch b/zint-shared.patch deleted file mode 100644 index 3343d78..0000000 --- a/zint-shared.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -r c65c3e1348ca backend_qt/.CMakeLists.txt.swp -Binary file backend_qt/.CMakeLists.txt.swp has changed -diff -r c65c3e1348ca backend_qt/CMakeLists.txt ---- a/backend_qt/CMakeLists.txt Sat Aug 14 17:34:15 2021 +0200 -+++ b/backend_qt/CMakeLists.txt Sat Aug 14 17:35:27 2021 +0200 -@@ -12,7 +12,7 @@ - qt5_wrap_cpp(QZint_SRCS qzint.h) - endif() - --add_library(${PROJECT_NAME} STATIC ${QZint_SRCS}) -+add_library(${PROJECT_NAME} SHARED ${QZint_SRCS}) - - set_target_properties(${PROJECT_NAME} PROPERTIES SOVERSION "${ZINT_VERSION_MAJOR}.${ZINT_VERSION_MINOR}" - VERSION ${ZINT_VERSION}) diff --git a/zint.spec b/zint.spec index 4afaa8e..c1113fe 100644 --- a/zint.spec +++ b/zint.spec @@ -1,23 +1,18 @@ Name: zint -Version: 2.15.0 -Release: 4%{?dist} +Version: 2.6.6 +Release: 3%{?dist} Summary: Barcode generator library -License: BSD-3-Clause AND GPL-3.0-or-later +License: GPLv3+ URL: http://www.zint.org.uk -Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}-src.tar.gz +Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -# create shared libQZint instead of static one -Patch0: %{name}-shared.patch +# patch to disable creation of rpaths +Patch0: %{name}-rpath.patch BuildRequires: cmake -BuildRequires: gcc -BuildRequires: gcc-c++ BuildRequires: libpng-devel BuildRequires: zlib-devel -BuildRequires: mesa-libGL-devel -BuildRequires: qt5-qtbase-devel -BuildRequires: qt5-qtsvg-devel -BuildRequires: qt5-qttools-devel +BuildRequires: qt-devel BuildRequires: qt5-qttools-static BuildRequires: desktop-file-utils @@ -64,7 +59,8 @@ C library and header files needed to develop applications that use libQZint. %prep -%autosetup -p1 -n %{name}-%{version}-src +%setup -q +%patch0 -p1 # fix line endings sed -i "s|\r||g" docs/manual.txt @@ -80,16 +76,16 @@ find -type f -exec chmod 644 {} \; %build %cmake %cmake_build +gunzip frontend/%{name}.1.gz %install %cmake_install rm -rf %{buildroot}/%{_datadir}/apps -install -D -p -m 644 docs/%{name}.1 %{buildroot}%{_mandir}/man1/%{name}.1 +install -D -p -m 644 frontend/%{name}.1 %{buildroot}%{_mandir}/man1/%{name}.1 install -D -p -m 644 cmake/modules/FindZint.cmake %{buildroot}%{_datadir}/cmake/Modules/FindZint.cmake -install -D -p -m 644 %{name}-qt.png %{buildroot}/usr/share/pixmaps/%{name}-qt.png +install -D -p -m 644 %{name}.png %{buildroot}/usr/share/pixmaps/%{name}.png install -D -p -m 644 %{name}-qt.desktop %{buildroot}%{_datadir}/applications/%{name}-qt.desktop -mv %{buildroot}%{_datadir}/%{name} %{buildroot}%{_datadir}/cmake/%{name} desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}-qt.desktop @@ -98,8 +94,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}-qt.desktop %files -%doc docs/manual.txt README TODO -%license LICENSE frontend/COPYING +%doc docs/manual.txt COPYING README TODO %{_bindir}/%{name} %{_mandir}/man1/%{name}.1* %{_libdir}/libzint.so.* @@ -107,14 +102,13 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}-qt.desktop %files devel %{_includedir}/%{name}.h %{_libdir}/libzint.so -%{_datadir}/cmake/%{name}/ %{_datadir}/cmake/Modules/*.cmake %files qt %{_bindir}/%{name}-qt %{_libdir}/libQZint.so.* %{_datadir}/applications/%{name}-qt.desktop -%{_datadir}/pixmaps/%{name}-qt.png +%{_datadir}/pixmaps/%{name}.png %files qt-devel %{_includedir}/qzint.h @@ -122,63 +116,11 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}-qt.desktop %changelog -* Fri Jul 17 2026 Fedora Release Engineering - 2.15.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild +* Wed Jul 29 2020 Fedora Release Engineering - 2.6.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild -* Sat Jan 17 2026 Fedora Release Engineering - 2.15.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild - -* Fri Jul 25 2025 Fedora Release Engineering - 2.15.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Sun May 18 2025 Martin Gieseking - 2.15.0-1 -- Update to 2.15.0 -- Dropped rpath patch which is no longer required -- Updated license (libzint is now licensed under BSD-3-Clause) - -* Sun Jan 19 2025 Fedora Release Engineering - 2.13.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Thu Jul 25 2024 Miroslav Suchý - 2.13.0-4 -- convert license to SPDX - -* Sat Jul 20 2024 Fedora Release Engineering - 2.13.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Sat Jan 27 2024 Fedora Release Engineering - 2.13.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Mon Dec 18 2023 Martin Gieseking - 2.13.0-1 -- Update to 2.13.0 - -* Sat Jul 22 2023 Fedora Release Engineering - 2.12.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Sat Jan 21 2023 Fedora Release Engineering - 2.12.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Tue Dec 13 2022 Martin Gieseking - 2.12.0-1 -- Update to 2.12.0 - -* Sat Jul 23 2022 Fedora Release Engineering - 2.11.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Wed May 25 2022 Martin Gieseking - 2.11.0-1 -- Update to 2.11.0. - -* Sat Jan 22 2022 Fedora Release Engineering - 2.10.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Sat Aug 14 2021 Martin Gieseking - 2.10.0-1 -- Update to 2.10.0. -- Mark license file properly. - -* Fri Jul 23 2021 Fedora Release Engineering - 2.9.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Mon Feb 01 2021 Martin Gieseking - 2.9.1-1 -- Update to 2.9.1. -- Use cmake macros. +* Fri Jan 31 2020 Fedora Release Engineering - 2.6.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild * Wed Sep 25 2019 Martin Gieseking - 2.6.6-1 - Update to release 2.6.6