From 4e8e1544bdb9dab37d40d0c0efd63dc2c1bdcba2 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Dec 29 2020 02:02:46 +0000 Subject: Upgrade to 0.3.0 (#1911379) --- diff --git a/.gitignore b/.gitignore index e1de07d..6798dc3 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,4 @@ -iec16022-0.2.4.tar.gz +/gpgkey-C61D16E59E2CD10C895838A40899A2B906D4D9C7.gpg +/iec16022-*.tar.gz +/iec16022-*.tar.xz +/iec16022-*.tar.xz.asc diff --git a/iec16022-0.2.4-test-suite-fix.patch b/iec16022-0.2.4-test-suite-fix.patch deleted file mode 100644 index 32ca1c5..0000000 --- a/iec16022-0.2.4-test-suite-fix.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -dur iec16022-0.2.4.orig/test/testsuite.sh iec16022-0.2.4/test/testsuite.sh ---- iec16022-0.2.4.orig/test/testsuite.sh 2008-11-30 03:22:32.000000000 +0300 -+++ iec16022-0.2.4/test/testsuite.sh 2010-06-02 14:15:14.130267000 +0300 -@@ -8,11 +8,11 @@ - ../iec16022 -o testsuite-test.bin -f Bin -c "Aolash3l dee6Ieke OhBohm1C MengaR9m zaHaoQu2 huW3Uer8 ieg7chaJ haiKua1o" - ../iec16022 -o testsuite-test.hex -f Hex -c "Aolash3l dee6Ieke OhBohm1C MengaR9m zaHaoQu2 huW3Uer8 ieg7chaJ haiKua1o" - --diff -b testsuite-test.text testsuite-example.text && echo "Text test passed" || echo "Text test FAILED" || FAILED=1 --diff -b testsuite-test.eps testsuite-example.eps && echo "EPS test passed" || echo "EPS test FAILED" || FAILED=1 --diff -b testsuite-test.png testsuite-example.png && echo "PNG test passed" || echo "PNG test FAILED" || FAILED=1 --diff -b testsuite-test.bin testsuite-example.bin && echo "Bin test passed" || echo "Bin test FAILED" || FAILED=1 --diff -b testsuite-test.hex testsuite-example.hex && echo "Hex test passed" || echo "Hex test FAILED" || FAILED=1 -+diff -b testsuite-test.text testsuite-example.text && echo "Text test passed" || { echo "Text test FAILED" && FAILED=1 ; } -+diff -b testsuite-test.eps testsuite-example.eps && echo "EPS test passed" || { echo "EPS test FAILED" && FAILED=1 ; } -+diff -b testsuite-test.png testsuite-example.png && echo "PNG test passed" || { echo "PNG test FAILED" && FAILED=1 ; } -+diff -b testsuite-test.bin testsuite-example.bin && echo "Bin test passed" || { echo "Bin test FAILED" && FAILED=1 ; } -+diff -b testsuite-test.hex testsuite-example.hex && echo "Hex test passed" || { echo "Hex test FAILED" && FAILED=1 ; } - - rm testsuite-test.* - -Only in iec16022-0.2.4/test: testsuite.sh~ diff --git a/iec16022.spec b/iec16022.spec index 83e1479..a26704b 100644 --- a/iec16022.spec +++ b/iec16022.spec @@ -1,57 +1,61 @@ # TODO: shared lib calls exit Name: iec16022 -Version: 0.2.4 -Release: 25%{?dist} +Version: 0.3.0 +Release: 1%{?dist} Summary: Generate ISO/IEC 16022 2D barcodes License: GPLv2+ -URL: http://www.datenfreihafen.org/projects/iec16022.html -Source0: http://www.datenfreihafen.org/~stefan/iec16022/%{name}-%{version}.tar.gz -Patch0: %{name}-%{version}-test-suite-fix.patch +URL: https://github.com/rdoeffinger/iec16022 +Source0: https://github.com/rdoeffinger/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.xz +Source1: https://github.com/rdoeffinger/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.xz.asc +Source2: gpgkey-C61D16E59E2CD10C895838A40899A2B906D4D9C7.gpg -## For ARM64 support. +BuildRequires: gnupg2 BuildRequires: gcc -BuildRequires: autoconf >= 2.69 -BuildRequires: popt-devel zlib-devel -BuildRequires: make +BuildRequires: make +BuildRequires: popt-devel +BuildRequires: zlib-devel +Requires: %{name}-libs%{?_isa} = %{version}-%{release} %description -iec16022 is a program for producing ISO/IEC 16022 2D barcodes, also -known as Data Matrix. These barcodes are defined in the ISO/IEC 16022 +The iec16022 is a program for producing ISO/IEC 16022 2D barcodes, also +known as Data Matrix. These barcodes are defined in the ISO/IEC 16022 standard. %package libs Summary: ISO/IEC 16022 libraries %description libs -%{summary}. +The iec16022-libs package provides libraries for producing ISO/IEC 16022 +2D barcodes, also known as Data Matrix. These barcodes are defined in the +ISO/IEC 16022 standard. %package devel -Summary: ISO/IEC 16022 development files +Summary: Development files for the iec16022 library Requires: %{name}-libs%{?_isa} = %{version}-%{release} Requires: pkgconfig %description devel -%{summary}. +The iec16022-devel package includes header files and libraries necessary +for developing programs which use the iec16022 C library. %prep +%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' %setup -q -%patch0 -p1 -b .orig %build -autoconf %configure --disable-static sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool -make %{?_smp_mflags} +%make_build %install -make install DESTDIR=$RPM_BUILD_ROOT +%make_install rm -f $RPM_BUILD_ROOT%{_libdir}/libiec16022.la @@ -68,7 +72,8 @@ make -C test check %{_mandir}/man1/iec16022.1* %files libs -%doc AUTHORS ChangeLog COPYING README TODO +%license COPYING +%doc AUTHORS NEWS README %{_libdir}/libiec16022.so.* %files devel @@ -78,6 +83,9 @@ make -C test check %changelog +* Tue Dec 29 2020 Robert Scheck - 0.3.0-1 +- Upgrade to 0.3.0 (#1911379) + * Tue Jul 28 2020 Fedora Release Engineering - 0.2.4-25 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index 3b680df..2e5013b 100644 --- a/sources +++ b/sources @@ -1 +1,3 @@ -9395108f1deaa2c4bd6d05a9e7c91431 iec16022-0.2.4.tar.gz +SHA512 (gpgkey-C61D16E59E2CD10C895838A40899A2B906D4D9C7.gpg) = 6e29806be81b996491e202fccd7a9876750799da824a6e97d67b83934ad93b153ec67d6121fa1fe1f3d5bbec33ec02bb59e46420c408486e84caae46d515c929 +SHA512 (iec16022-0.3.0.tar.xz) = 6be70f6fe71f691f9e90f39e978d8833cc51cc78264ef659c23ef35e44299b327c4b33da44911e3b0a3cab66eb3aa3c7fc93a4f177d786c6f0b69a49bcf7c0bc +SHA512 (iec16022-0.3.0.tar.xz.asc) = b868c8125022f8c1d2464399da85fd787403be217b964473612b61eaf8947251b60d00478414a41407ee2850fc77fdd2a428705de4bd1b60b5a6a7b2796c9063