diff --git a/.gitignore b/.gitignore index cb770b8..c689a91 100644 --- a/.gitignore +++ b/.gitignore @@ -12,4 +12,3 @@ 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 4530847..d4b3e34 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zint-2.15.0-src.tar.gz) = 7b5f44837a3a16637be5871ce848747ef520d623d86c88602c4ba8f0fe76705836ccee67a83e7ad0544e56b041dadbe88c5ed0b3219946be924213be18d74e2a +SHA512 (zint-2.13.0-src.tar.gz) = 8dacd8088ab9c99ea64bf1aa49b618251d1e2d49382817d536a824ef25d9e8f0e2d8dbd0baa5dc1b4945dbede83d1af08e9f317107b1356a3ceb382acb6dd8c2 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.spec b/zint.spec index 4afaa8e..575d233 100644 --- a/zint.spec +++ b/zint.spec @@ -1,13 +1,16 @@ Name: zint -Version: 2.15.0 -Release: 4%{?dist} +Version: 2.13.0 +Release: 5%{?dist} Summary: Barcode generator library -License: BSD-3-Clause AND GPL-3.0-or-later +# 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 +# patch to disable creation of rpaths +Patch0: %{name}-rpath.patch # create shared libQZint instead of static one -Patch0: %{name}-shared.patch +Patch1: %{name}-shared.patch BuildRequires: cmake BuildRequires: gcc @@ -64,7 +67,9 @@ C library and header files needed to develop applications that use libQZint. %prep -%autosetup -p1 -n %{name}-%{version}-src +%setup -q -n %{name}-%{version}-src +%patch -P0 -p1 +%patch -P1 -p1 # fix line endings sed -i "s|\r||g" docs/manual.txt @@ -99,7 +104,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}-qt.desktop %files %doc docs/manual.txt README TODO -%license LICENSE frontend/COPYING +%license LICENSE %{_bindir}/%{name} %{_mandir}/man1/%{name}.1* %{_libdir}/libzint.so.* @@ -122,20 +127,6 @@ 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 - -* 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