Compare commits

..

No commits in common. "rawhide" and "epel8" have entirely different histories.

4 changed files with 37 additions and 65 deletions

4
.gitignore vendored
View file

@ -9,7 +9,3 @@ 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
/zint-2.12.0-src.tar.gz
/zint-2.13.0-src.tar.gz
/zint-2.15.0-src.tar.gz

View file

@ -1 +1 @@
SHA512 (zint-2.15.0-src.tar.gz) = 7b5f44837a3a16637be5871ce848747ef520d623d86c88602c4ba8f0fe76705836ccee67a83e7ad0544e56b041dadbe88c5ed0b3219946be924213be18d74e2a
SHA512 (zint-2.10.0-src.tar.gz) = d902abe5e5fed7be469177a75f71dd7f211366ef8da4ebd8c3e8808d4f97c781388740e4802c765c2c0b57bb2798ae70d223190d08274cedfef3a1711970a463

23
zint-rpath.patch Normal file
View file

@ -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)
-

View file

@ -1,23 +1,22 @@
Name: zint
Version: 2.15.0
Release: 4%{?dist}
Version: 2.10.0
Release: 1%{?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
# 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
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
@ -64,7 +63,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
%patch0 -p1
%patch1 -p1
# fix line endings
sed -i "s|\r||g" docs/manual.txt
@ -78,18 +79,18 @@ 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 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}-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 +100,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}-qt.desktop
%files
%doc docs/manual.txt README TODO
%license LICENSE frontend/COPYING
%license COPYING
%{_bindir}/%{name}
%{_mandir}/man1/%{name}.1*
%{_libdir}/libzint.so.*
@ -107,7 +108,6 @@ 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
@ -122,53 +122,6 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}-qt.desktop
%changelog
* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 2.15.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 2.15.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.15.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Sun May 18 2025 Martin Gieseking <martin.gieseking@uos.de> - 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 <releng@fedoraproject.org> - 2.13.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Thu Jul 25 2024 Miroslav Suchý <msuchy@redhat.com> - 2.13.0-4
- convert license to SPDX
* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.13.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.13.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Mon Dec 18 2023 Martin Gieseking <martin.gieseking@uos.de> - 2.13.0-1
- Update to 2.13.0
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.12.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.12.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Tue Dec 13 2022 Martin Gieseking <martin.gieseking@uos.de> - 2.12.0-1
- Update to 2.12.0
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.11.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Wed May 25 2022 Martin Gieseking <martin.gieseking@uos.de> - 2.11.0-1
- Update to 2.11.0.
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.10.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Sat Aug 14 2021 Martin Gieseking <martin.gieseking@uos.de> - 2.10.0-1
- Update to 2.10.0.
- Mark license file properly.