From 6fcdfb032873820fefa70b089b60e37ef21d65e9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 05:19:48 +0000 Subject: [PATCH 01/23] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zint.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zint.spec b/zint.spec index ac87d94..9d2100b 100644 --- a/zint.spec +++ b/zint.spec @@ -1,6 +1,6 @@ Name: zint Version: 2.6.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Barcode generator library License: GPLv3+ URL: http://www.zint.org.uk @@ -116,6 +116,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}-qt.desktop %changelog +* 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 From 3d58a67fcd8286dc201f1168dd809749f7c90c75 Mon Sep 17 00:00:00 2001 From: Igor Raits Date: Sun, 5 Jul 2020 19:37:24 +0200 Subject: [PATCH 02/23] Improve compatibility with new CMake macro Signed-off-by: Igor Raits --- zint.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/zint.spec b/zint.spec index 9d2100b..9ae1bf8 100644 --- a/zint.spec +++ b/zint.spec @@ -74,13 +74,13 @@ rm -f frontend/getopt*.* find -type f -exec chmod 644 {} \; %build -%cmake . -make VERBOSE=1 %{?_smp_mflags} +%cmake +%cmake_build gunzip frontend/%{name}.1.gz %install -%make_install +%cmake_install rm -rf %{buildroot}/%{_datadir}/apps 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 From 9af7077e051511642360a2ba41c9c0f1ae1d3a71 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 15:23:41 +0000 Subject: [PATCH 03/23] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zint.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zint.spec b/zint.spec index 9ae1bf8..c1113fe 100644 --- a/zint.spec +++ b/zint.spec @@ -1,6 +1,6 @@ Name: zint Version: 2.6.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Barcode generator library License: GPLv3+ URL: http://www.zint.org.uk @@ -116,6 +116,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}-qt.desktop %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 2.6.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Fri Jan 31 2020 Fedora Release Engineering - 2.6.6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From ece1ef1199726b29c281527c54cff7fd5f0f14d5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 28 Jan 2021 00:42:31 +0000 Subject: [PATCH 04/23] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zint.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zint.spec b/zint.spec index c1113fe..27aac69 100644 --- a/zint.spec +++ b/zint.spec @@ -1,6 +1,6 @@ Name: zint Version: 2.6.6 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Barcode generator library License: GPLv3+ URL: http://www.zint.org.uk @@ -116,6 +116,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}-qt.desktop %changelog +* Thu Jan 28 2021 Fedora Release Engineering - 2.6.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Jul 29 2020 Fedora Release Engineering - 2.6.6-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 33293479ceea64a90606a2af05029058d1d9604d Mon Sep 17 00:00:00 2001 From: Martin Gieseking Date: Tue, 2 Feb 2021 09:20:45 +0100 Subject: [PATCH 05/23] updated to version 2.9.1 --- .gitignore | 1 + sources | 2 +- zint.spec | 23 ++++++++++------------- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index 3f42479..be9e69b 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ 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 diff --git a/sources b/sources index e36e8e4..9adc2fd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zint-2.6.6.tar.gz) = a8af614da6793d1cea886ba9c9649232c51457a0707be911180c41942698ccf20b95ebc90abf0d741253be1dea877698ce418023498134d42885b2e6a81291eb +SHA512 (zint-2.9.1-src.tar.gz) = c5e9c0c17f285f254e92b8e3eb6df043470cb0e7ea4fd84c16a78ed8aeec39f0c1c895df22ac339c19972028b93b21404aa518f1277d330ca5f6d8b999596cef diff --git a/zint.spec b/zint.spec index 27aac69..dc52ada 100644 --- a/zint.spec +++ b/zint.spec @@ -1,15 +1,17 @@ Name: zint -Version: 2.6.6 -Release: 4%{?dist} +Version: 2.9.1 +Release: 1%{?dist} Summary: Barcode generator library License: GPLv3+ URL: http://www.zint.org.uk -Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz +Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}-src.tar.gz # patch to disable creation of rpaths Patch0: %{name}-rpath.patch BuildRequires: cmake +BuildRequires: gcc +BuildRequires: gcc-c++ BuildRequires: libpng-devel BuildRequires: zlib-devel BuildRequires: qt-devel @@ -59,7 +61,7 @@ C library and header files needed to develop applications that use libQZint. %prep -%setup -q +%setup -q -n %{name}-%{version}-src %patch0 -p1 # fix line endings @@ -74,7 +76,7 @@ rm -f frontend/getopt*.* find -type f -exec chmod 644 {} \; %build -%cmake +%cmake . %cmake_build gunzip frontend/%{name}.1.gz @@ -116,14 +118,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}-qt.desktop %changelog -* Thu Jan 28 2021 Fedora Release Engineering - 2.6.6-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering - 2.6.6-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Jan 31 2020 Fedora Release Engineering - 2.6.6-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild +* Mon Feb 01 2021 Martin Gieseking - 2.9.1-1 +- Update to 2.9.1. +- Use cmake macros. * Wed Sep 25 2019 Martin Gieseking - 2.6.6-1 - Update to release 2.6.6 From 11aaf516b8dd34377ba2113f9f2c21efd0d0d91b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 22:18:31 +0000 Subject: [PATCH 06/23] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zint.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zint.spec b/zint.spec index dc52ada..2d8ddcc 100644 --- a/zint.spec +++ b/zint.spec @@ -1,6 +1,6 @@ Name: zint Version: 2.9.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Barcode generator library License: GPLv3+ URL: http://www.zint.org.uk @@ -118,6 +118,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}-qt.desktop %changelog +* 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. From aae74862ff5a752cba0b2d770d1cdd6e78f3fe1c Mon Sep 17 00:00:00 2001 From: Martin Gieseking Date: Sat, 14 Aug 2021 18:32:45 +0200 Subject: [PATCH 07/23] update to version 2.10.0 --- .gitignore | 1 + sources | 2 +- zint.spec | 20 ++++++++++++++------ 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index be9e69b..c64d6f7 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ zint-2.3.2.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 diff --git a/sources b/sources index 9adc2fd..33a7e08 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zint-2.9.1-src.tar.gz) = c5e9c0c17f285f254e92b8e3eb6df043470cb0e7ea4fd84c16a78ed8aeec39f0c1c895df22ac339c19972028b93b21404aa518f1277d330ca5f6d8b999596cef +SHA512 (zint-2.10.0-src.tar.gz) = d902abe5e5fed7be469177a75f71dd7f211366ef8da4ebd8c3e8808d4f97c781388740e4802c765c2c0b57bb2798ae70d223190d08274cedfef3a1711970a463 diff --git a/zint.spec b/zint.spec index 2d8ddcc..0a1bcaf 100644 --- a/zint.spec +++ b/zint.spec @@ -1,6 +1,6 @@ Name: zint -Version: 2.9.1 -Release: 2%{?dist} +Version: 2.10.0 +Release: 1%{?dist} Summary: Barcode generator library License: GPLv3+ URL: http://www.zint.org.uk @@ -8,13 +8,15 @@ Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}-src.tar.g # patch to disable creation of rpaths Patch0: %{name}-rpath.patch +# create shared libQZint instead of static one +Patch1: %{name}-shared.patch BuildRequires: cmake BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: libpng-devel BuildRequires: zlib-devel -BuildRequires: qt-devel +BuildRequires: qt5-qtbase-devel BuildRequires: qt5-qttools-static BuildRequires: desktop-file-utils @@ -63,6 +65,7 @@ C library and header files needed to develop applications that use libQZint. %prep %setup -q -n %{name}-%{version}-src %patch0 -p1 +%patch1 -p1 # fix line endings sed -i "s|\r||g" docs/manual.txt @@ -86,7 +89,7 @@ gunzip frontend/%{name}.1.gz rm -rf %{buildroot}/%{_datadir}/apps 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}.png %{buildroot}/usr/share/pixmaps/%{name}.png +install -D -p -m 644 %{name}-qt.png %{buildroot}/usr/share/pixmaps/%{name}-qt.png install -D -p -m 644 %{name}-qt.desktop %{buildroot}%{_datadir}/applications/%{name}-qt.desktop desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}-qt.desktop @@ -96,7 +99,8 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}-qt.desktop %files -%doc docs/manual.txt COPYING README TODO +%doc docs/manual.txt README TODO +%license COPYING %{_bindir}/%{name} %{_mandir}/man1/%{name}.1* %{_libdir}/libzint.so.* @@ -110,7 +114,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}-qt.desktop %{_bindir}/%{name}-qt %{_libdir}/libQZint.so.* %{_datadir}/applications/%{name}-qt.desktop -%{_datadir}/pixmaps/%{name}.png +%{_datadir}/pixmaps/%{name}-qt.png %files qt-devel %{_includedir}/qzint.h @@ -118,6 +122,10 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}-qt.desktop %changelog +* 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 From 3a0d497c7a62ec732420dcc0f6af834d251c02db Mon Sep 17 00:00:00 2001 From: Martin Gieseking Date: Sat, 14 Aug 2021 18:41:38 +0200 Subject: [PATCH 08/23] add missing patch and removed redundant one --- zint-kix-leak.patch | 12 ------------ zint-shared.patch | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 12 deletions(-) delete mode 100644 zint-kix-leak.patch create mode 100644 zint-shared.patch diff --git a/zint-kix-leak.patch b/zint-kix-leak.patch deleted file mode 100644 index 8e91ac9..0000000 --- a/zint-kix-leak.patch +++ /dev/null @@ -1,12 +0,0 @@ -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-shared.patch b/zint-shared.patch new file mode 100644 index 0000000..3343d78 --- /dev/null +++ b/zint-shared.patch @@ -0,0 +1,14 @@ +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}) From 8fbff47d91a8477b4abb8e4171fc99009396c3db Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 05:52:08 +0000 Subject: [PATCH 09/23] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zint.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zint.spec b/zint.spec index 0a1bcaf..0ebcaab 100644 --- a/zint.spec +++ b/zint.spec @@ -1,6 +1,6 @@ Name: zint Version: 2.10.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Barcode generator library License: GPLv3+ URL: http://www.zint.org.uk @@ -122,6 +122,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}-qt.desktop %changelog +* 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. From 7b710c81e629b3e0405c7cb968018bba18d48652 Mon Sep 17 00:00:00 2001 From: Martin Gieseking Date: Wed, 25 May 2022 12:48:08 +0200 Subject: [PATCH 10/23] update to version 2.11.0 --- .gitignore | 1 + sources | 2 +- zint.spec | 12 +++++++----- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index c64d6f7..3ad62dd 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ zint-2.3.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 diff --git a/sources b/sources index 33a7e08..76326a1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zint-2.10.0-src.tar.gz) = d902abe5e5fed7be469177a75f71dd7f211366ef8da4ebd8c3e8808d4f97c781388740e4802c765c2c0b57bb2798ae70d223190d08274cedfef3a1711970a463 +SHA512 (zint-2.11.0-src.tar.gz) = 9d31465ed6b2ca9276a9a4985cb6d4198efa92ba0a333ebc8f77b2606d41b7bb140c45dc714b468e9649dba85760433c5749a3f052b27078a6ffefcef6d0bf1e diff --git a/zint.spec b/zint.spec index 0ebcaab..e6c6ebc 100644 --- a/zint.spec +++ b/zint.spec @@ -1,6 +1,6 @@ Name: zint -Version: 2.10.0 -Release: 2%{?dist} +Version: 2.11.0 +Release: 1%{?dist} Summary: Barcode generator library License: GPLv3+ URL: http://www.zint.org.uk @@ -79,15 +79,14 @@ rm -f frontend/getopt*.* find -type f -exec chmod 644 {} \; %build -%cmake . +%cmake %cmake_build -gunzip frontend/%{name}.1.gz %install %cmake_install rm -rf %{buildroot}/%{_datadir}/apps -install -D -p -m 644 frontend/%{name}.1 %{buildroot}%{_mandir}/man1/%{name}.1 +install -D -p -m 644 docs/%{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}-qt.desktop %{buildroot}%{_datadir}/applications/%{name}-qt.desktop @@ -122,6 +121,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}-qt.desktop %changelog +* 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 From ed1110d4025c8cdd4c618458fd1308af3e45c47a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 13:55:54 +0000 Subject: [PATCH 11/23] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zint.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zint.spec b/zint.spec index e6c6ebc..e4ced3e 100644 --- a/zint.spec +++ b/zint.spec @@ -1,6 +1,6 @@ Name: zint Version: 2.11.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Barcode generator library License: GPLv3+ URL: http://www.zint.org.uk @@ -121,6 +121,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}-qt.desktop %changelog +* 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. From 0fe3c50e2ed13300fc84a94129e032f06de90871 Mon Sep 17 00:00:00 2001 From: Martin Gieseking Date: Tue, 13 Dec 2022 16:17:54 +0100 Subject: [PATCH 12/23] update to version 2.12.0 --- .gitignore | 1 + sources | 2 +- zint.spec | 14 +++++++++++--- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 3ad62dd..950bcd7 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ zint-2.3.2.src.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 diff --git a/sources b/sources index 76326a1..0090b80 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zint-2.11.0-src.tar.gz) = 9d31465ed6b2ca9276a9a4985cb6d4198efa92ba0a333ebc8f77b2606d41b7bb140c45dc714b468e9649dba85760433c5749a3f052b27078a6ffefcef6d0bf1e +SHA512 (zint-2.12.0-src.tar.gz) = 0fd6abf8ee7ce9c1695c570fc9771481a3a9e13fd1ab36a318e1cc6e9b55d5ef164707da14ad1719efa5b2a178ccf49e770d76450398881c7dcb03ed1c0b017d diff --git a/zint.spec b/zint.spec index e4ced3e..4994c9b 100644 --- a/zint.spec +++ b/zint.spec @@ -1,6 +1,6 @@ Name: zint -Version: 2.11.0 -Release: 2%{?dist} +Version: 2.12.0 +Release: 1%{?dist} Summary: Barcode generator library License: GPLv3+ URL: http://www.zint.org.uk @@ -16,7 +16,10 @@ 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: qt5-qttools-static BuildRequires: desktop-file-utils @@ -90,6 +93,7 @@ install -D -p -m 644 docs/%{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}-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 @@ -99,7 +103,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}-qt.desktop %files %doc docs/manual.txt README TODO -%license COPYING +%license LICENSE %{_bindir}/%{name} %{_mandir}/man1/%{name}.1* %{_libdir}/libzint.so.* @@ -107,6 +111,7 @@ 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 @@ -121,6 +126,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}-qt.desktop %changelog +* 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 From 8749a32a0202c7b6a48d13e5cc7ba7fe5d7c661b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 08:16:31 +0000 Subject: [PATCH 13/23] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zint.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zint.spec b/zint.spec index 4994c9b..20974a5 100644 --- a/zint.spec +++ b/zint.spec @@ -1,6 +1,6 @@ Name: zint Version: 2.12.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Barcode generator library License: GPLv3+ URL: http://www.zint.org.uk @@ -126,6 +126,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}-qt.desktop %changelog +* 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 From b316a3770afe0d2cbfb5f36943c1e10aeb7d224b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 19:42:48 +0000 Subject: [PATCH 14/23] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zint.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zint.spec b/zint.spec index 20974a5..e1d2234 100644 --- a/zint.spec +++ b/zint.spec @@ -1,6 +1,6 @@ Name: zint Version: 2.12.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Barcode generator library License: GPLv3+ URL: http://www.zint.org.uk @@ -126,6 +126,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}-qt.desktop %changelog +* 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 From 12afc7bdac756ce2424805e18639267016de33c6 Mon Sep 17 00:00:00 2001 From: Martin Gieseking Date: Mon, 18 Dec 2023 11:59:03 +0100 Subject: [PATCH 15/23] update to version 2.13.0 --- .gitignore | 1 + sources | 2 +- zint.spec | 11 +++++++---- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 950bcd7..c689a91 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ zint-2.3.2.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 diff --git a/sources b/sources index 0090b80..d4b3e34 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zint-2.12.0-src.tar.gz) = 0fd6abf8ee7ce9c1695c570fc9771481a3a9e13fd1ab36a318e1cc6e9b55d5ef164707da14ad1719efa5b2a178ccf49e770d76450398881c7dcb03ed1c0b017d +SHA512 (zint-2.13.0-src.tar.gz) = 8dacd8088ab9c99ea64bf1aa49b618251d1e2d49382817d536a824ef25d9e8f0e2d8dbd0baa5dc1b4945dbede83d1af08e9f317107b1356a3ceb382acb6dd8c2 diff --git a/zint.spec b/zint.spec index e1d2234..a3e10f9 100644 --- a/zint.spec +++ b/zint.spec @@ -1,6 +1,6 @@ Name: zint -Version: 2.12.0 -Release: 3%{?dist} +Version: 2.13.0 +Release: 1%{?dist} Summary: Barcode generator library License: GPLv3+ URL: http://www.zint.org.uk @@ -67,8 +67,8 @@ C library and header files needed to develop applications that use libQZint. %prep %setup -q -n %{name}-%{version}-src -%patch0 -p1 -%patch1 -p1 +%patch -P0 -p1 +%patch -P1 -p1 # fix line endings sed -i "s|\r||g" docs/manual.txt @@ -126,6 +126,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}-qt.desktop %changelog +* 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 From ce95cbb0f59e485f4ded46791acf87d91f759ebf Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 11:07:54 +0000 Subject: [PATCH 16/23] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- zint.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zint.spec b/zint.spec index a3e10f9..1194cc5 100644 --- a/zint.spec +++ b/zint.spec @@ -1,6 +1,6 @@ Name: zint Version: 2.13.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Barcode generator library License: GPLv3+ URL: http://www.zint.org.uk @@ -126,6 +126,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}-qt.desktop %changelog +* 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 From 8f7b801c6c9cd2dd3a5c1d26b91c5c6e59142750 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 10:53:00 +0000 Subject: [PATCH 17/23] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- zint.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zint.spec b/zint.spec index 1194cc5..e513778 100644 --- a/zint.spec +++ b/zint.spec @@ -1,6 +1,6 @@ Name: zint Version: 2.13.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Barcode generator library License: GPLv3+ URL: http://www.zint.org.uk @@ -126,6 +126,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}-qt.desktop %changelog +* 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 From 6c5f1efdda29e7a2f1cc99753f20d512d54408ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Thu, 25 Jul 2024 13:36:35 +0200 Subject: [PATCH 18/23] convert GPLv3+ license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- zint.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/zint.spec b/zint.spec index e513778..bcc7738 100644 --- a/zint.spec +++ b/zint.spec @@ -1,8 +1,9 @@ Name: zint Version: 2.13.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Barcode generator library -License: GPLv3+ +# Automatically converted from old format: GPLv3+ - review is highly recommended. +License: GPL-3.0-or-later URL: http://www.zint.org.uk Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}-src.tar.gz @@ -126,6 +127,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}-qt.desktop %changelog +* 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 From 194a14c606896ab0a725f2e0b81442514322e34b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 16:47:13 +0000 Subject: [PATCH 19/23] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- zint.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zint.spec b/zint.spec index bcc7738..575d233 100644 --- a/zint.spec +++ b/zint.spec @@ -1,6 +1,6 @@ Name: zint Version: 2.13.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Barcode generator library # Automatically converted from old format: GPLv3+ - review is highly recommended. License: GPL-3.0-or-later @@ -127,6 +127,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}-qt.desktop %changelog +* 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 From bca1364662634852679c94e4e60482f6062c173e Mon Sep 17 00:00:00 2001 From: Martin Gieseking Date: Sun, 18 May 2025 20:02:10 +0200 Subject: [PATCH 20/23] update to version 2.15.0 --- .gitignore | 1 + sources | 2 +- zint-rpath.patch | 23 ----------------------- zint.spec | 22 +++++++++++----------- 4 files changed, 13 insertions(+), 35 deletions(-) delete mode 100644 zint-rpath.patch diff --git a/.gitignore b/.gitignore index c689a91..cb770b8 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ zint-2.3.2.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 d4b3e34..4530847 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zint-2.13.0-src.tar.gz) = 8dacd8088ab9c99ea64bf1aa49b618251d1e2d49382817d536a824ef25d9e8f0e2d8dbd0baa5dc1b4945dbede83d1af08e9f317107b1356a3ceb382acb6dd8c2 +SHA512 (zint-2.15.0-src.tar.gz) = 7b5f44837a3a16637be5871ce848747ef520d623d86c88602c4ba8f0fe76705836ccee67a83e7ad0544e56b041dadbe88c5ed0b3219946be924213be18d74e2a diff --git a/zint-rpath.patch b/zint-rpath.patch deleted file mode 100644 index 02f5e7b..0000000 --- a/zint-rpath.patch +++ /dev/null @@ -1,23 +0,0 @@ -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.spec b/zint.spec index 575d233..2c00bfe 100644 --- a/zint.spec +++ b/zint.spec @@ -1,16 +1,13 @@ Name: zint -Version: 2.13.0 -Release: 5%{?dist} +Version: 2.15.0 +Release: 1%{?dist} Summary: Barcode generator library -# Automatically converted from old format: GPLv3+ - review is highly recommended. -License: GPL-3.0-or-later +License: BSD-3-Clause AND GPL-3.0-or-later URL: http://www.zint.org.uk Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}-src.tar.gz -# patch to disable creation of rpaths -Patch0: %{name}-rpath.patch # create shared libQZint instead of static one -Patch1: %{name}-shared.patch +Patch0: %{name}-shared.patch BuildRequires: cmake BuildRequires: gcc @@ -67,9 +64,7 @@ C library and header files needed to develop applications that use libQZint. %prep -%setup -q -n %{name}-%{version}-src -%patch -P0 -p1 -%patch -P1 -p1 +%autosetup -p1 -n %{name}-%{version}-src # fix line endings sed -i "s|\r||g" docs/manual.txt @@ -104,7 +99,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}-qt.desktop %files %doc docs/manual.txt README TODO -%license LICENSE +%license LICENSE frontend/COPYING %{_bindir}/%{name} %{_mandir}/man1/%{name}.1* %{_libdir}/libzint.so.* @@ -127,6 +122,11 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}-qt.desktop %changelog +* 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 From a0e2b098ac0e64ce0726c8c7fdc9f1d7c393a7bf Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 21:18:45 +0000 Subject: [PATCH 21/23] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- zint.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zint.spec b/zint.spec index 2c00bfe..827f861 100644 --- a/zint.spec +++ b/zint.spec @@ -1,6 +1,6 @@ Name: zint Version: 2.15.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Barcode generator library License: BSD-3-Clause AND GPL-3.0-or-later URL: http://www.zint.org.uk @@ -122,6 +122,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}-qt.desktop %changelog +* 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 From af5310c0934bc299e57b25799a98baf937f1adf5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 21:08:41 +0000 Subject: [PATCH 22/23] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- zint.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zint.spec b/zint.spec index 827f861..bb056ca 100644 --- a/zint.spec +++ b/zint.spec @@ -1,6 +1,6 @@ Name: zint Version: 2.15.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Barcode generator library License: BSD-3-Clause AND GPL-3.0-or-later URL: http://www.zint.org.uk @@ -122,6 +122,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}-qt.desktop %changelog +* 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 From c2a53043df0e5680f7ab8809dbf269ab8e927d71 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 09:41:04 +0000 Subject: [PATCH 23/23] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- zint.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zint.spec b/zint.spec index bb056ca..4afaa8e 100644 --- a/zint.spec +++ b/zint.spec @@ -1,6 +1,6 @@ Name: zint Version: 2.15.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Barcode generator library License: BSD-3-Clause AND GPL-3.0-or-later URL: http://www.zint.org.uk @@ -122,6 +122,9 @@ 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 + * Sat Jan 17 2026 Fedora Release Engineering - 2.15.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild