From 4e88935ae40bcadc26f94a342dec8d278ccb82f1 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Wed, 14 Jul 2010 16:51:43 +0000 Subject: [PATCH 01/49] Setup of module qrencode --- .cvsignore | 0 Makefile | 21 +++++++++++++++++++++ sources | 0 3 files changed, 21 insertions(+) create mode 100644 .cvsignore create mode 100644 Makefile create mode 100644 sources diff --git a/.cvsignore b/.cvsignore new file mode 100644 index 0000000..e69de29 diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..0943b78 --- /dev/null +++ b/Makefile @@ -0,0 +1,21 @@ +# Makefile for source rpm: qrencode +# $Id$ +NAME := qrencode +SPECFILE = $(firstword $(wildcard *.spec)) + +define find-makefile-common +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +endef + +MAKEFILE_COMMON := $(shell $(find-makefile-common)) + +ifeq ($(MAKEFILE_COMMON),) +# attept a checkout +define checkout-makefile-common +test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 +endef + +MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) +endif + +include $(MAKEFILE_COMMON) diff --git a/sources b/sources new file mode 100644 index 0000000..e69de29 From ff882c8026ba1b16f7748acc21de873e44c94f48 Mon Sep 17 00:00:00 2001 From: Tareq Al Jurf Date: Thu, 15 Jul 2010 10:16:44 +0000 Subject: [PATCH 02/49] Initial build for F-14 --- .cvsignore | 1 + import.log | 1 + qrencode.spec | 82 +++++++++++++++++++++++++++++++++++++++++++++++++++ sources | 1 + 4 files changed, 85 insertions(+) create mode 100644 import.log create mode 100644 qrencode.spec diff --git a/.cvsignore b/.cvsignore index e69de29..110d476 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +qrencode-3.1.1.tar.gz diff --git a/import.log b/import.log new file mode 100644 index 0000000..efcaa94 --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +qrencode-3_1_1-4_fc14:HEAD:qrencode-3.1.1-4.fc14.src.rpm:1279188952 diff --git a/qrencode.spec b/qrencode.spec new file mode 100644 index 0000000..aa7a4a3 --- /dev/null +++ b/qrencode.spec @@ -0,0 +1,82 @@ +Name: qrencode +Version: 3.1.1 +Release: 4%{?dist} +Summary: Generate QR 2D barcodes + +Group: Applications/Engineering +License: LGPLv2+ +URL: http://megaui.net/fukuchi/works/qrencode/index.en.html +Source0: http://megaui.net/fukuchi/works/qrencode/%{name}-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: libpng-devel chrpath + + +%description +Qrencode is a utility software using libqrencode to encode string data in +a QR Code and save as a PNG image. + +%package devel +Summary: QR Code encoding library - Development files +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description devel +The qrencode-devel package contains libraries and header files for developing +applications that use qrencode. + +%prep +%setup -q + + +%build +%configure --with-tests +make %{?_smp_mflags} + + +%install +rm -rf $RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" +rm -rf $RPM_BUILD_ROOT%{_libdir}/libqrencode.la +chrpath --delete $RPM_BUILD_ROOT%{_bindir}/qrencode + +%check +cd ./tests +sh test_all.sh + +%clean +rm -rf $RPM_BUILD_ROOT + + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + + +%files +%defattr(-,root,root,-) +%doc ChangeLog COPYING NEWS README TODO +%{_bindir}/qrencode +%{_mandir}/man1/qrencode.1.* +%{_libdir}/libqrencode.so.3 +%{_libdir}/libqrencode.so.3.1.1 + +%files devel +%defattr(-,root,root,-) +%{_includedir}/qrencode.h +%{_libdir}/libqrencode.so +%{_libdir}/pkgconfig/libqrencode.pc + + +%changelog +* Tue Jul 13 2010 Tareq Al Jurf - 3.1.1-4 +- Fixed the rpath problem. + +* Mon Jul 12 2010 Tareq Al Jurf - 3.1.1-3 +- Fixed some small spec mistakes. + +* Mon Jul 12 2010 Tareq Al Jurf - 3.1.1-2 +- Fixed some small errors. + +* Thu Jul 08 2010 Tareq Al Jurf - 3.1.1-1 +- Initial build. diff --git a/sources b/sources index e69de29..2f15938 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +d97f67cbefaf577e6c15923f3cc57b6a qrencode-3.1.1.tar.gz From ba8cb2fc9d4c7a1363c18518684e712d33abae67 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 11:04:24 +0000 Subject: [PATCH 03/49] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- import.log | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 import.log diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 0943b78..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: qrencode -# $Id$ -NAME := qrencode -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/import.log b/import.log deleted file mode 100644 index efcaa94..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -qrencode-3_1_1-4_fc14:HEAD:qrencode-3.1.1-4.fc14.src.rpm:1279188952 From e09f97f1d188891649c2560301079a984c13c135 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 8 Feb 2011 23:19:09 -0600 Subject: [PATCH 04/49] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- qrencode.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qrencode.spec b/qrencode.spec index aa7a4a3..dd75aad 100644 --- a/qrencode.spec +++ b/qrencode.spec @@ -1,6 +1,6 @@ Name: qrencode Version: 3.1.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Generate QR 2D barcodes Group: Applications/Engineering @@ -69,6 +69,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Feb 08 2011 Fedora Release Engineering - 3.1.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Tue Jul 13 2010 Tareq Al Jurf - 3.1.1-4 - Fixed the rpath problem. From 15c86dbad02d5133a26fcbe8225cc457a5cac958 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Tue, 6 Dec 2011 00:58:00 -0500 Subject: [PATCH 05/49] Rebuild for new libpng --- qrencode.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qrencode.spec b/qrencode.spec index dd75aad..18f74e9 100644 --- a/qrencode.spec +++ b/qrencode.spec @@ -1,6 +1,6 @@ Name: qrencode Version: 3.1.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Generate QR 2D barcodes Group: Applications/Engineering @@ -69,6 +69,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Dec 06 2011 Adam Jackson - 3.1.1-6 +- Rebuild for new libpng + * Tue Feb 08 2011 Fedora Release Engineering - 3.1.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From 855a5366849953374dcfdeda14be3a86862704f5 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 13 Jan 2012 20:30:16 -0600 Subject: [PATCH 06/49] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- qrencode.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qrencode.spec b/qrencode.spec index 18f74e9..b53a210 100644 --- a/qrencode.spec +++ b/qrencode.spec @@ -1,6 +1,6 @@ Name: qrencode Version: 3.1.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Generate QR 2D barcodes Group: Applications/Engineering @@ -69,6 +69,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Jan 14 2012 Fedora Release Engineering - 3.1.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Tue Dec 06 2011 Adam Jackson - 3.1.1-6 - Rebuild for new libpng From 680fec3e7cf13bd4e3e8d33963f3f37075267730 Mon Sep 17 00:00:00 2001 From: Casper Date: Sun, 15 Jan 2012 22:35:32 +0100 Subject: [PATCH 07/49] update to 3.2.0 --- .gitignore | 1 + qrencode.spec | 22 +++++++++++----------- sources | 2 +- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index 110d476..de5cb62 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ qrencode-3.1.1.tar.gz +/qrencode-3.2.0.tar.gz diff --git a/qrencode.spec b/qrencode.spec index b53a210..2b44474 100644 --- a/qrencode.spec +++ b/qrencode.spec @@ -1,13 +1,12 @@ Name: qrencode -Version: 3.1.1 -Release: 7%{?dist} +Version: 3.2.0 +Release: 1%{?dist} Summary: Generate QR 2D barcodes Group: Applications/Engineering License: LGPLv2+ URL: http://megaui.net/fukuchi/works/qrencode/index.en.html Source0: http://megaui.net/fukuchi/works/qrencode/%{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libpng-devel chrpath @@ -35,7 +34,6 @@ make %{?_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" rm -rf $RPM_BUILD_ROOT%{_libdir}/libqrencode.la chrpath --delete $RPM_BUILD_ROOT%{_bindir}/qrencode @@ -44,9 +42,6 @@ chrpath --delete $RPM_BUILD_ROOT%{_bindir}/qrencode cd ./tests sh test_all.sh -%clean -rm -rf $RPM_BUILD_ROOT - %post -p /sbin/ldconfig @@ -54,21 +49,26 @@ rm -rf $RPM_BUILD_ROOT %files -%defattr(-,root,root,-) %doc ChangeLog COPYING NEWS README TODO %{_bindir}/qrencode %{_mandir}/man1/qrencode.1.* -%{_libdir}/libqrencode.so.3 -%{_libdir}/libqrencode.so.3.1.1 +%{_libdir}/libqrencode.so.* %files devel -%defattr(-,root,root,-) %{_includedir}/qrencode.h %{_libdir}/libqrencode.so %{_libdir}/pkgconfig/libqrencode.pc %changelog +* Sun Jan 15 2012 Matthieu Saulnier - 3.2.0-1 +- update to 3.2.0 +- remove BuildRoot tag in spec file +- remove "rm -rf $RPM_BUILD_ROOT" at the beginning of %%install section +- remove %%clean section +- remove %%defattr lines +- add a joker for libqrencode.so.* files + * Sat Jan 14 2012 Fedora Release Engineering - 3.1.1-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild diff --git a/sources b/sources index 2f15938..b43c352 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d97f67cbefaf577e6c15923f3cc57b6a qrencode-3.1.1.tar.gz +328050395ae53ccea23b5cbabe6dc7f8 qrencode-3.2.0.tar.gz From 386155014589f722991e519fa44160ac4caf4f6d Mon Sep 17 00:00:00 2001 From: Peter Gordon Date: Thu, 23 Feb 2012 00:29:11 -0800 Subject: [PATCH 08/49] Add patch to fix LIBPTHREAD macro in pkgconfig file. (#795582) --- qrencode-fix-LIBPTHREAD-macro.patch | 9 +++++++++ qrencode.spec | 8 +++++++- 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 qrencode-fix-LIBPTHREAD-macro.patch diff --git a/qrencode-fix-LIBPTHREAD-macro.patch b/qrencode-fix-LIBPTHREAD-macro.patch new file mode 100644 index 0000000..9062949 --- /dev/null +++ b/qrencode-fix-LIBPTHREAD-macro.patch @@ -0,0 +1,9 @@ +--- ./libqrencode.pc.in.orig 2012-02-20 15:36:29.983533958 -0800 ++++ ./libqrencode.pc.in.orig 2012-02-20 15:56:41.252501662 -0800 +@@ -6,5 +6,5 @@ includedir=@includedir@ + Name: libqrencode + Description: A QR Code encoding library + Version: @VERSION@ +-Libs: -L${libdir} -lqrencode @LIBPTHREAD@ ++Libs: -L${libdir} -lqrencode -pthread + Cflags: -I${includedir} diff --git a/qrencode.spec b/qrencode.spec index 2b44474..7f28cc8 100644 --- a/qrencode.spec +++ b/qrencode.spec @@ -1,6 +1,6 @@ Name: qrencode Version: 3.2.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Generate QR 2D barcodes Group: Applications/Engineering @@ -61,6 +61,12 @@ sh test_all.sh %changelog +* Thu Feb 23 2012 Peter Gordon - 3.2.0-2 +- Add patch to fix improper LIBPTHREAD macro in the pkgconfig file: + + fix-LIBPTHREAD-macro.patch +- Resolves: #795582 (qrencode-devel: Malformed pkgconfig file causes build to + fail ("@LIBPTHREAD@: No such file or directory")) + * Sun Jan 15 2012 Matthieu Saulnier - 3.2.0-1 - update to 3.2.0 - remove BuildRoot tag in spec file From f4660342e26c90c3de30095e2029bed295d605f2 Mon Sep 17 00:00:00 2001 From: Peter Gordon Date: Sat, 25 Feb 2012 10:22:59 -0800 Subject: [PATCH 09/49] Actually apply the LIBPTHREAD patch. --- qrencode-fix-LIBPTHREAD-macro.patch | 2 +- qrencode.spec | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/qrencode-fix-LIBPTHREAD-macro.patch b/qrencode-fix-LIBPTHREAD-macro.patch index 9062949..ab804bf 100644 --- a/qrencode-fix-LIBPTHREAD-macro.patch +++ b/qrencode-fix-LIBPTHREAD-macro.patch @@ -1,5 +1,5 @@ --- ./libqrencode.pc.in.orig 2012-02-20 15:36:29.983533958 -0800 -+++ ./libqrencode.pc.in.orig 2012-02-20 15:56:41.252501662 -0800 ++++ ./libqrencode.pc.in 2012-02-20 15:56:41.252501662 -0800 @@ -6,5 +6,5 @@ includedir=@includedir@ Name: libqrencode Description: A QR Code encoding library diff --git a/qrencode.spec b/qrencode.spec index 7f28cc8..e01a94e 100644 --- a/qrencode.spec +++ b/qrencode.spec @@ -1,6 +1,6 @@ Name: qrencode Version: 3.2.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Generate QR 2D barcodes Group: Applications/Engineering @@ -8,6 +8,8 @@ License: LGPLv2+ URL: http://megaui.net/fukuchi/works/qrencode/index.en.html Source0: http://megaui.net/fukuchi/works/qrencode/%{name}-%{version}.tar.gz +Patch0: %{name}-fix-LIBPTHREAD-macro.patch + BuildRequires: libpng-devel chrpath @@ -26,6 +28,7 @@ applications that use qrencode. %prep %setup -q +%patch0 -b .fix-LIBPTHREAD-macro.patch %build @@ -61,6 +64,9 @@ sh test_all.sh %changelog +* Sat Feb 25 2012 Peter Gordon - 3.2.0-3 +- Fix applying the LIBPTHREAD patch. (Thanks to Matthieu Saulnier.) + * Thu Feb 23 2012 Peter Gordon - 3.2.0-2 - Add patch to fix improper LIBPTHREAD macro in the pkgconfig file: + fix-LIBPTHREAD-macro.patch From 289f53fd1bf9a9baf0f93573b128445050e1d37a Mon Sep 17 00:00:00 2001 From: Matthieu Saulnier Date: Sat, 23 Jun 2012 23:02:36 +0200 Subject: [PATCH 10/49] Update to 3.3.1 --- .gitignore | 1 + qrencode.spec | 17 ++++++++++------- sources | 2 +- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index de5cb62..1fddb3a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ qrencode-3.1.1.tar.gz /qrencode-3.2.0.tar.gz +/qrencode-3.3.1.tar.gz diff --git a/qrencode.spec b/qrencode.spec index e01a94e..58eec5a 100644 --- a/qrencode.spec +++ b/qrencode.spec @@ -1,15 +1,12 @@ Name: qrencode -Version: 3.2.0 -Release: 3%{?dist} +Version: 3.3.1 +Release: 1%{?dist} Summary: Generate QR 2D barcodes -Group: Applications/Engineering License: LGPLv2+ URL: http://megaui.net/fukuchi/works/qrencode/index.en.html Source0: http://megaui.net/fukuchi/works/qrencode/%{name}-%{version}.tar.gz -Patch0: %{name}-fix-LIBPTHREAD-macro.patch - BuildRequires: libpng-devel chrpath @@ -28,7 +25,6 @@ applications that use qrencode. %prep %setup -q -%patch0 -b .fix-LIBPTHREAD-macro.patch %build @@ -54,7 +50,7 @@ sh test_all.sh %files %doc ChangeLog COPYING NEWS README TODO %{_bindir}/qrencode -%{_mandir}/man1/qrencode.1.* +%{_mandir}/man1/qrencode.1* %{_libdir}/libqrencode.so.* %files devel @@ -64,6 +60,13 @@ sh test_all.sh %changelog +* Sat Jun 23 2012 Matthieu Saulnier - 3.3.1-1 +- update to 3.3.1 +- remove "Group" tag in spec file +- fix manfile suffix +- remove patch to fix improper LIBPTHREAD macro in the pkgconfig file: + - upstream issue + * Sat Feb 25 2012 Peter Gordon - 3.2.0-3 - Fix applying the LIBPTHREAD patch. (Thanks to Matthieu Saulnier.) diff --git a/sources b/sources index b43c352..e8288d0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -328050395ae53ccea23b5cbabe6dc7f8 qrencode-3.2.0.tar.gz +07a0b45d0226054f2fac05ba5bbaf65f qrencode-3.3.1.tar.gz From 5b7fcb00da0175c207632aad8fd1d102aec8132d Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 21 Jul 2012 08:23:51 -0500 Subject: [PATCH 11/49] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- qrencode.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qrencode.spec b/qrencode.spec index 58eec5a..7ab7171 100644 --- a/qrencode.spec +++ b/qrencode.spec @@ -1,6 +1,6 @@ Name: qrencode Version: 3.3.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Generate QR 2D barcodes License: LGPLv2+ @@ -60,6 +60,9 @@ sh test_all.sh %changelog +* Sat Jul 21 2012 Fedora Release Engineering - 3.3.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Sat Jun 23 2012 Matthieu Saulnier - 3.3.1-1 - update to 3.3.1 - remove "Group" tag in spec file From 6a9668537ae3bdc0a3d4391d1fabf62b0f358fff Mon Sep 17 00:00:00 2001 From: Matthieu Saulnier Date: Thu, 16 Aug 2012 21:58:12 +0200 Subject: [PATCH 12/49] Add French translation in spec file --- qrencode.spec | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/qrencode.spec b/qrencode.spec index 7ab7171..583cbf7 100644 --- a/qrencode.spec +++ b/qrencode.spec @@ -1,7 +1,8 @@ Name: qrencode Version: 3.3.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Generate QR 2D barcodes +Summary(fr): Génère les code-barres en 2D QR License: LGPLv2+ URL: http://megaui.net/fukuchi/works/qrencode/index.en.html @@ -14,15 +15,25 @@ BuildRequires: libpng-devel chrpath Qrencode is a utility software using libqrencode to encode string data in a QR Code and save as a PNG image. +%description -l fr +Qrencode est un logiciel utilitaire utilisant libqrencode pour encoder +les données dans un QR Code et sauvegarde dans une image PNG. + + %package devel Summary: QR Code encoding library - Development files -Group: Development/Libraries +Summary(fr): Bibliothèque d'encodage QR Code - Fichiers de développement Requires: %{name} = %{version}-%{release} %description devel The qrencode-devel package contains libraries and header files for developing applications that use qrencode. +%description devel -l fr +Le paquet qrencode-devel contient les bibliothèques et les fichiers d'en-tête +pour le développement d'applications utilisant qrencode. + + %prep %setup -q @@ -37,6 +48,7 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" rm -rf $RPM_BUILD_ROOT%{_libdir}/libqrencode.la chrpath --delete $RPM_BUILD_ROOT%{_bindir}/qrencode + %check cd ./tests sh test_all.sh @@ -60,6 +72,10 @@ sh test_all.sh %changelog +* Thu Aug 16 2012 Matthieu Saulnier - 3.3.1-3 +- Add French translation in spec file +- Fix incomplete removing Group tags in spec file + * Sat Jul 21 2012 Fedora Release Engineering - 3.3.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From ed9e9f9b1f93dd51f8aea5d28db73722247c7cc2 Mon Sep 17 00:00:00 2001 From: Matthieu Saulnier Date: Fri, 21 Sep 2012 22:42:42 +0200 Subject: [PATCH 13/49] Add libs subpackage \(fix RHBZ #856808\) --- qrencode.spec | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/qrencode.spec b/qrencode.spec index 583cbf7..7ae2b1c 100644 --- a/qrencode.spec +++ b/qrencode.spec @@ -1,6 +1,6 @@ Name: qrencode Version: 3.3.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Generate QR 2D barcodes Summary(fr): Génère les code-barres en 2D QR @@ -23,7 +23,7 @@ les données dans un QR Code et sauvegarde dans une image PNG. %package devel Summary: QR Code encoding library - Development files Summary(fr): Bibliothèque d'encodage QR Code - Fichiers de développement -Requires: %{name} = %{version}-%{release} +Requires: %{name}-libs%{?_isa} = %{version}-%{release} %description devel The qrencode-devel package contains libraries and header files for developing @@ -34,6 +34,19 @@ Le paquet qrencode-devel contient les bibliothèques et les fichiers d'en-tête pour le développement d'applications utilisant qrencode. +%package libs +Summary: QR Code encoding library - Shared libraries +Summary(fr): Bibliothèque d'encodage QR Code - Bibliothèque partagée + +%description libs +The qrencode-libs package contains the shared libraries and header files for +applications that use qrencode. + +%description libs -l fr +Le paquet qrencode-libs contient les bibliothèques partagées et les fichiers +d'en-tête pour les applications utilisant qrencode. + + %prep %setup -q @@ -54,15 +67,17 @@ cd ./tests sh test_all.sh -%post -p /sbin/ldconfig +%post libs -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%postun libs -p /sbin/ldconfig %files -%doc ChangeLog COPYING NEWS README TODO %{_bindir}/qrencode %{_mandir}/man1/qrencode.1* + +%files libs +%doc ChangeLog COPYING NEWS README TODO %{_libdir}/libqrencode.so.* %files devel @@ -72,6 +87,9 @@ sh test_all.sh %changelog +* Fri Sep 21 2012 Matthieu Saulnier - 3.3.1-4 +- Add libs subpackage (fix RHBZ #856808) + * Thu Aug 16 2012 Matthieu Saulnier - 3.3.1-3 - Add French translation in spec file - Fix incomplete removing Group tags in spec file From c7ee99ddbd7ffefe0c6d7a7284f3614227e33c2c Mon Sep 17 00:00:00 2001 From: Matthieu Saulnier Date: Fri, 25 Jan 2013 14:14:03 +0100 Subject: [PATCH 14/49] Update to 3.4.1 --- .gitignore | 1 + qrencode.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 1fddb3a..e7933ad 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ qrencode-3.1.1.tar.gz /qrencode-3.2.0.tar.gz /qrencode-3.3.1.tar.gz +/qrencode-3.4.1.tar.gz diff --git a/qrencode.spec b/qrencode.spec index 7ae2b1c..3d4dcc7 100644 --- a/qrencode.spec +++ b/qrencode.spec @@ -1,6 +1,6 @@ Name: qrencode -Version: 3.3.1 -Release: 4%{?dist} +Version: 3.4.1 +Release: 1%{?dist} Summary: Generate QR 2D barcodes Summary(fr): Génère les code-barres en 2D QR @@ -87,6 +87,9 @@ sh test_all.sh %changelog +* Fri Jan 25 2013 Matthieu Saulnier - 3.4.1-1 +- Update to 3.4.1 + * Fri Sep 21 2012 Matthieu Saulnier - 3.3.1-4 - Add libs subpackage (fix RHBZ #856808) diff --git a/sources b/sources index e8288d0..2f51fe8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -07a0b45d0226054f2fac05ba5bbaf65f qrencode-3.3.1.tar.gz +2ab3eca6d9e7901f578e72b2768090c5 qrencode-3.4.1.tar.gz From 7fb093c52879c347551f9d4b0c4937b0ddbcd9ac Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 4 Aug 2013 06:35:34 -0500 Subject: [PATCH 15/49] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- qrencode.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qrencode.spec b/qrencode.spec index 3d4dcc7..8fc7ac6 100644 --- a/qrencode.spec +++ b/qrencode.spec @@ -1,6 +1,6 @@ Name: qrencode Version: 3.4.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Generate QR 2D barcodes Summary(fr): Génère les code-barres en 2D QR @@ -87,6 +87,9 @@ sh test_all.sh %changelog +* Sun Aug 04 2013 Fedora Release Engineering - 3.4.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Fri Jan 25 2013 Matthieu Saulnier - 3.4.1-1 - Update to 3.4.1 From d9bca3d5e88f1a263edec89ce835a35425e3333b Mon Sep 17 00:00:00 2001 From: Peter Gordon Date: Sun, 11 Aug 2013 00:17:07 -0700 Subject: [PATCH 16/49] Update to new upstream release (3.4.2). Fix #926414. Update source/homepage URLs. --- .gitignore | 1 + qrencode.spec | 24 ++++++++++++++++++------ sources | 2 +- 3 files changed, 20 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index e7933ad..830feb8 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ qrencode-3.1.1.tar.gz /qrencode-3.2.0.tar.gz /qrencode-3.3.1.tar.gz /qrencode-3.4.1.tar.gz +/qrencode-3.4.2.tar.bz2 diff --git a/qrencode.spec b/qrencode.spec index 8fc7ac6..b5de06e 100644 --- a/qrencode.spec +++ b/qrencode.spec @@ -1,15 +1,18 @@ Name: qrencode -Version: 3.4.1 -Release: 2%{?dist} +Version: 3.4.2 +Release: 1%{?dist} Summary: Generate QR 2D barcodes Summary(fr): Génère les code-barres en 2D QR License: LGPLv2+ -URL: http://megaui.net/fukuchi/works/qrencode/index.en.html -Source0: http://megaui.net/fukuchi/works/qrencode/%{name}-%{version}.tar.gz - -BuildRequires: libpng-devel chrpath +URL: http://fukuchi.org/works/qrencode/ +Source0: http://fukuchi.org/works/qrencode/%{name}-%{version}.tar.bz2 +BuildRequires: chrpath +BuildRequires: libpng-devel +BuildRequires: SDL-devel +## For ARM 64 support (RHBZ 926414) +BuildRequires: autoconf >= 2.69 %description Qrencode is a utility software using libqrencode to encode string data in @@ -52,6 +55,8 @@ d'en-tête pour les applications utilisant qrencode. %build +## Rebuild configure scripts for ARM 64 support. (RHBZ 926414) +%{__autoconf} %configure --with-tests make %{?_smp_mflags} @@ -87,6 +92,13 @@ sh test_all.sh %changelog +* Sun Aug 11 2013 Peter Gordon - 3.4.2-1 +- Update to new upstream release (3.4.2) + - Fixes a memory leak, string-splitting, and Micro QR encoding bugs. +- Run autoconf in %%build to add ARM 64 (aarch64) to the configure scripts. +- Resolves: #926414 (qrencode: Does not support aarch64 in f19 and rawhide) +- Update source/homepage URLs. + * Sun Aug 04 2013 Fedora Release Engineering - 3.4.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild diff --git a/sources b/sources index 2f51fe8..76e484d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2ab3eca6d9e7901f578e72b2768090c5 qrencode-3.4.1.tar.gz +2c1693a29fe2f26089ccdff9051c0a3f qrencode-3.4.2.tar.bz2 From 76e53b3650f2ade546bf7b5e68f15dc85202bae7 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 20:11:43 -0500 Subject: [PATCH 17/49] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- qrencode.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qrencode.spec b/qrencode.spec index b5de06e..29fa40a 100644 --- a/qrencode.spec +++ b/qrencode.spec @@ -1,6 +1,6 @@ Name: qrencode Version: 3.4.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Generate QR 2D barcodes Summary(fr): Génère les code-barres en 2D QR @@ -92,6 +92,9 @@ sh test_all.sh %changelog +* Sun Jun 08 2014 Fedora Release Engineering - 3.4.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Sun Aug 11 2013 Peter Gordon - 3.4.2-1 - Update to new upstream release (3.4.2) - Fixes a memory leak, string-splitting, and Micro QR encoding bugs. From 53a48b9ae7fdffde96cf013590e7fc46784f7b7b Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Mon, 4 Aug 2014 00:27:25 -0400 Subject: [PATCH 18/49] fix license handling --- qrencode.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/qrencode.spec b/qrencode.spec index 29fa40a..d91f6cc 100644 --- a/qrencode.spec +++ b/qrencode.spec @@ -1,6 +1,6 @@ Name: qrencode Version: 3.4.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Generate QR 2D barcodes Summary(fr): Génère les code-barres en 2D QR @@ -82,7 +82,9 @@ sh test_all.sh %{_mandir}/man1/qrencode.1* %files libs -%doc ChangeLog COPYING NEWS README TODO +%{!?_licensedir:%global license %%doc} +%license COPYING +%doc ChangeLog NEWS README TODO %{_libdir}/libqrencode.so.* %files devel @@ -92,6 +94,9 @@ sh test_all.sh %changelog +* Mon Aug 4 2014 Tom Callaway - 3.4.2-3 +- fix license handling + * Sun Jun 08 2014 Fedora Release Engineering - 3.4.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 59e873e7dfec40eeeb88f73b71d2a25aaf7668ac Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sun, 17 Aug 2014 22:36:36 +0000 Subject: [PATCH 19/49] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- qrencode.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qrencode.spec b/qrencode.spec index d91f6cc..35a0c26 100644 --- a/qrencode.spec +++ b/qrencode.spec @@ -1,6 +1,6 @@ Name: qrencode Version: 3.4.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Generate QR 2D barcodes Summary(fr): Génère les code-barres en 2D QR @@ -94,6 +94,9 @@ sh test_all.sh %changelog +* Sun Aug 17 2014 Fedora Release Engineering - 3.4.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Mon Aug 4 2014 Tom Callaway - 3.4.2-3 - fix license handling From 5add6c21464bb75f03bf53d7871eee23a0c44a0a Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 18 Jun 2015 21:45:22 +0000 Subject: [PATCH 20/49] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- qrencode.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qrencode.spec b/qrencode.spec index 35a0c26..7f40b3d 100644 --- a/qrencode.spec +++ b/qrencode.spec @@ -1,6 +1,6 @@ Name: qrencode Version: 3.4.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Generate QR 2D barcodes Summary(fr): Génère les code-barres en 2D QR @@ -94,6 +94,9 @@ sh test_all.sh %changelog +* Thu Jun 18 2015 Fedora Release Engineering - 3.4.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Sun Aug 17 2014 Fedora Release Engineering - 3.4.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From 6a9766d81b9760713e2056d696646904c46b83fc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 4 Feb 2016 21:42:58 +0000 Subject: [PATCH 21/49] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- qrencode.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qrencode.spec b/qrencode.spec index 7f40b3d..2085310 100644 --- a/qrencode.spec +++ b/qrencode.spec @@ -1,6 +1,6 @@ Name: qrencode Version: 3.4.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Generate QR 2D barcodes Summary(fr): Génère les code-barres en 2D QR @@ -94,6 +94,9 @@ sh test_all.sh %changelog +* Thu Feb 04 2016 Fedora Release Engineering - 3.4.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Thu Jun 18 2015 Fedora Release Engineering - 3.4.2-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From b9d183a507f4985a4dffd5eaecab31a265d21828 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 11:16:53 +0000 Subject: [PATCH 22/49] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- qrencode.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qrencode.spec b/qrencode.spec index 2085310..0f91777 100644 --- a/qrencode.spec +++ b/qrencode.spec @@ -1,6 +1,6 @@ Name: qrencode Version: 3.4.2 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Generate QR 2D barcodes Summary(fr): Génère les code-barres en 2D QR @@ -94,6 +94,9 @@ sh test_all.sh %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 3.4.2-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Thu Feb 04 2016 Fedora Release Engineering - 3.4.2-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From f5c307645ef56d808c5a02ab67974c0b4568dfae Mon Sep 17 00:00:00 2001 From: Peter Gordon Date: Sun, 4 Jun 2017 02:33:24 -0700 Subject: [PATCH 23/49] Update to new upstream release (3.4.4). --- .gitignore | 1 + qrencode.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 830feb8..870c7ac 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ qrencode-3.1.1.tar.gz /qrencode-3.3.1.tar.gz /qrencode-3.4.1.tar.gz /qrencode-3.4.2.tar.bz2 +/qrencode-3.4.4.tar.bz2 diff --git a/qrencode.spec b/qrencode.spec index 0f91777..92716c4 100644 --- a/qrencode.spec +++ b/qrencode.spec @@ -1,6 +1,6 @@ Name: qrencode -Version: 3.4.2 -Release: 7%{?dist} +Version: 3.4.4 +Release: 1%{?dist} Summary: Generate QR 2D barcodes Summary(fr): Génère les code-barres en 2D QR @@ -94,6 +94,9 @@ sh test_all.sh %changelog +* Sun Jun 04 2017 Peter Gordon - 3.4.4-1 +- Update to new upstream bug-fix release (3.4.4). + * Sat Feb 11 2017 Fedora Release Engineering - 3.4.2-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/sources b/sources index 76e484d..80b0c32 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2c1693a29fe2f26089ccdff9051c0a3f qrencode-3.4.2.tar.bz2 +SHA512 (qrencode-3.4.4.tar.bz2) = 4835d462542e37e5460635e0dd84e291ff0976a6aec61c63f9950c1e60b446bc913220726e14f6379322bfd32ccd9bcd5fceed9ca10cb95343c952d8472b983d From b1b501517c5479547de231381ea05baaadc838ce Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 12:39:24 +0000 Subject: [PATCH 24/49] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- qrencode.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qrencode.spec b/qrencode.spec index 92716c4..60cf0d4 100644 --- a/qrencode.spec +++ b/qrencode.spec @@ -1,6 +1,6 @@ Name: qrencode Version: 3.4.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Generate QR 2D barcodes Summary(fr): Génère les code-barres en 2D QR @@ -94,6 +94,9 @@ sh test_all.sh %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 3.4.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Sun Jun 04 2017 Peter Gordon - 3.4.4-1 - Update to new upstream bug-fix release (3.4.4). From f84dad8a8caa2ceff0c366db0cff35e9577067c0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 07:15:27 +0000 Subject: [PATCH 25/49] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- qrencode.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qrencode.spec b/qrencode.spec index 60cf0d4..fa341f6 100644 --- a/qrencode.spec +++ b/qrencode.spec @@ -1,6 +1,6 @@ Name: qrencode Version: 3.4.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Generate QR 2D barcodes Summary(fr): Génère les code-barres en 2D QR @@ -94,6 +94,9 @@ sh test_all.sh %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 3.4.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Thu Jul 27 2017 Fedora Release Engineering - 3.4.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 9f3f18aea3cca94f9edd86b04c58e318516d74cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0pl=C3=ADchal?= Date: Wed, 18 Oct 2017 20:17:32 +0200 Subject: [PATCH 26/49] Add CI tests using the standard test interface Adding simple smoke test for qrencode according to the CI wiki [0] and standard test interface [1]. [0] https://fedoraproject.org/wiki/CI [1] https://fedoraproject.org/wiki/Changes/InvokingTests --- tests/smoke/Makefile | 62 ++++++++++++++++++++++++++++++++++++++++++ tests/smoke/PURPOSE | 3 ++ tests/smoke/runtest.sh | 54 ++++++++++++++++++++++++++++++++++++ tests/tests.yml | 12 ++++++++ 4 files changed, 131 insertions(+) create mode 100644 tests/smoke/Makefile create mode 100644 tests/smoke/PURPOSE create mode 100755 tests/smoke/runtest.sh create mode 100644 tests/tests.yml diff --git a/tests/smoke/Makefile b/tests/smoke/Makefile new file mode 100644 index 0000000..8385e9f --- /dev/null +++ b/tests/smoke/Makefile @@ -0,0 +1,62 @@ +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# +# Makefile of /CoreOS/qrencode/Sanity/smoke +# Description: Check sanity of qrencode +# Author: Petr Splichal +# +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# +# Copyright (c) 2017 Red Hat, Inc. +# +# This program is free software: you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation, either version 2 of +# the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be +# useful, but WITHOUT ANY WARRANTY; without even the implied +# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +# PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see http://www.gnu.org/licenses/. +# +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +export TEST=/CoreOS/qrencode/Sanity/smoke +export TESTVERSION=1.0 + +BUILT_FILES= + +FILES=$(METADATA) runtest.sh Makefile PURPOSE + +.PHONY: all install download clean + +run: $(FILES) build + ./runtest.sh + +build: $(BUILT_FILES) + test -x runtest.sh || chmod a+x runtest.sh + +clean: + rm -f *~ $(BUILT_FILES) + + +include /usr/share/rhts/lib/rhts-make.include + +$(METADATA): Makefile + @echo "Owner: Petr Splichal " > $(METADATA) + @echo "Name: $(TEST)" >> $(METADATA) + @echo "TestVersion: $(TESTVERSION)" >> $(METADATA) + @echo "Path: $(TEST_DIR)" >> $(METADATA) + @echo "Description: Check sanity of qrencode" >> $(METADATA) + @echo "Type: Sanity" >> $(METADATA) + @echo "TestTime: 5m" >> $(METADATA) + @echo "RunFor: qrencode" >> $(METADATA) + @echo "Requires: qrencode file" >> $(METADATA) + @echo "Priority: Normal" >> $(METADATA) + @echo "License: GPLv2+" >> $(METADATA) + @echo "Confidential: no" >> $(METADATA) + @echo "Destructive: no" >> $(METADATA) + + rhts-lint $(METADATA) diff --git a/tests/smoke/PURPOSE b/tests/smoke/PURPOSE new file mode 100644 index 0000000..f2d820f --- /dev/null +++ b/tests/smoke/PURPOSE @@ -0,0 +1,3 @@ +PURPOSE of /CoreOS/qrencode/Sanity/smoke +Description: Check sanity of qrencode +Author: Petr Splichal diff --git a/tests/smoke/runtest.sh b/tests/smoke/runtest.sh new file mode 100755 index 0000000..52e35dd --- /dev/null +++ b/tests/smoke/runtest.sh @@ -0,0 +1,54 @@ +#!/bin/bash +# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# +# runtest.sh of /CoreOS/qrencode/Sanity/smoke +# Description: Check sanity of qrencode +# Author: Petr Splichal +# +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# +# Copyright (c) 2017 Red Hat, Inc. +# +# This program is free software: you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation, either version 2 of +# the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be +# useful, but WITHOUT ANY WARRANTY; without even the implied +# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +# PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see http://www.gnu.org/licenses/. +# +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +# Include Beaker environment +. /usr/bin/rhts-environment.sh || exit 1 +. /usr/share/beakerlib/beakerlib.sh || exit 1 + +PACKAGE="qrencode" + +rlJournalStart + rlPhaseStartSetup + rlAssertRpm $PACKAGE + rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory" + rlRun "pushd $TmpDir" + rlPhaseEnd + + rlPhaseStartTest + for type in png eps svg; do + rlRun "qrencode abcdefg -t $type -o qr.$type" + rlRun "file qr.$type | tee output" + rlAssertGrep "$type" "output" "-iq" + done + rlPhaseEnd + + rlPhaseStartCleanup + rlRun "popd" + rlRun "rm -r $TmpDir" 0 "Removing tmp directory" + rlPhaseEnd +rlJournalPrintText +rlJournalEnd diff --git a/tests/tests.yml b/tests/tests.yml new file mode 100644 index 0000000..e410357 --- /dev/null +++ b/tests/tests.yml @@ -0,0 +1,12 @@ +- hosts: localhost + roles: + - role: standard-test-beakerlib + tags: + - classic + - container + - atomic + tests: + - smoke + required_packages: + - qrencode + - file From 142b66b178148bafc17f313dc05c2fa078288e6b Mon Sep 17 00:00:00 2001 From: Matthieu Saulnier Date: Tue, 9 Jan 2018 19:49:17 +0100 Subject: [PATCH 27/49] update to 4.0.0 --- .gitignore | 1 + qrencode.spec | 17 +++++++++++------ sources | 2 +- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 870c7ac..0760b81 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ qrencode-3.1.1.tar.gz /qrencode-3.4.1.tar.gz /qrencode-3.4.2.tar.bz2 /qrencode-3.4.4.tar.bz2 +/qrencode-4.0.0.tar.bz2 diff --git a/qrencode.spec b/qrencode.spec index fa341f6..98a901f 100644 --- a/qrencode.spec +++ b/qrencode.spec @@ -1,6 +1,6 @@ Name: qrencode -Version: 3.4.4 -Release: 3%{?dist} +Version: 4.0.0 +Release: 1%{?dist} Summary: Generate QR 2D barcodes Summary(fr): Génère les code-barres en 2D QR @@ -10,7 +10,7 @@ Source0: http://fukuchi.org/works/qrencode/%{name}-%{version}.tar.bz2 BuildRequires: chrpath BuildRequires: libpng-devel -BuildRequires: SDL-devel +BuildRequires: SDL2-devel ## For ARM 64 support (RHBZ 926414) BuildRequires: autoconf >= 2.69 @@ -25,7 +25,7 @@ les données dans un QR Code et sauvegarde dans une image PNG. %package devel Summary: QR Code encoding library - Development files -Summary(fr): Bibliothèque d'encodage QR Code - Fichiers de développement +Summary(fr): Bibliothèque pour encodage de QR Code - Fichiers de développement Requires: %{name}-libs%{?_isa} = %{version}-%{release} %description devel @@ -39,7 +39,7 @@ pour le développement d'applications utilisant qrencode. %package libs Summary: QR Code encoding library - Shared libraries -Summary(fr): Bibliothèque d'encodage QR Code - Bibliothèque partagée +Summary(fr): Bibliothèque pour encodage de QR Code - Bibliothèque partagée %description libs The qrencode-libs package contains the shared libraries and header files for @@ -47,7 +47,7 @@ applications that use qrencode. %description libs -l fr Le paquet qrencode-libs contient les bibliothèques partagées et les fichiers -d'en-tête pour les applications utilisant qrencode. +en-tête pour les applications utilisant qrencode. %prep @@ -94,6 +94,11 @@ sh test_all.sh %changelog +* Tue Jan 09 2018 Matthieu Saulnier - 4.0.0-1 +- Update to new upstream release (4.0.0) RHBZ#1510097 + - SDL 2.0 is required instead of SDL 1.2 for tests +- Fix french translation in spec file + * Thu Aug 03 2017 Fedora Release Engineering - 3.4.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild diff --git a/sources b/sources index 80b0c32..be10bad 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qrencode-3.4.4.tar.bz2) = 4835d462542e37e5460635e0dd84e291ff0976a6aec61c63f9950c1e60b446bc913220726e14f6379322bfd32ccd9bcd5fceed9ca10cb95343c952d8472b983d +SHA512 (qrencode-4.0.0.tar.bz2) = d4140d77fce3a1c39735cc3e98e3a19018daaa08c870644f71727d27ffb17711e76b4ed4e51718d90d812e78df75fe575617580ea9b1bf210438f8fd1734204e From a14239323e08af451c446c13f90a260cca5c4efc Mon Sep 17 00:00:00 2001 From: Matthieu Saulnier Date: Wed, 10 Jan 2018 00:44:41 +0100 Subject: [PATCH 28/49] Revert "update to 4.0.0" This reverts commit 142b66b178148bafc17f313dc05c2fa078288e6b. --- .gitignore | 1 - qrencode.spec | 17 ++++++----------- sources | 2 +- 3 files changed, 7 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index 0760b81..870c7ac 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,3 @@ qrencode-3.1.1.tar.gz /qrencode-3.4.1.tar.gz /qrencode-3.4.2.tar.bz2 /qrencode-3.4.4.tar.bz2 -/qrencode-4.0.0.tar.bz2 diff --git a/qrencode.spec b/qrencode.spec index 98a901f..fa341f6 100644 --- a/qrencode.spec +++ b/qrencode.spec @@ -1,6 +1,6 @@ Name: qrencode -Version: 4.0.0 -Release: 1%{?dist} +Version: 3.4.4 +Release: 3%{?dist} Summary: Generate QR 2D barcodes Summary(fr): Génère les code-barres en 2D QR @@ -10,7 +10,7 @@ Source0: http://fukuchi.org/works/qrencode/%{name}-%{version}.tar.bz2 BuildRequires: chrpath BuildRequires: libpng-devel -BuildRequires: SDL2-devel +BuildRequires: SDL-devel ## For ARM 64 support (RHBZ 926414) BuildRequires: autoconf >= 2.69 @@ -25,7 +25,7 @@ les données dans un QR Code et sauvegarde dans une image PNG. %package devel Summary: QR Code encoding library - Development files -Summary(fr): Bibliothèque pour encodage de QR Code - Fichiers de développement +Summary(fr): Bibliothèque d'encodage QR Code - Fichiers de développement Requires: %{name}-libs%{?_isa} = %{version}-%{release} %description devel @@ -39,7 +39,7 @@ pour le développement d'applications utilisant qrencode. %package libs Summary: QR Code encoding library - Shared libraries -Summary(fr): Bibliothèque pour encodage de QR Code - Bibliothèque partagée +Summary(fr): Bibliothèque d'encodage QR Code - Bibliothèque partagée %description libs The qrencode-libs package contains the shared libraries and header files for @@ -47,7 +47,7 @@ applications that use qrencode. %description libs -l fr Le paquet qrencode-libs contient les bibliothèques partagées et les fichiers -en-tête pour les applications utilisant qrencode. +d'en-tête pour les applications utilisant qrencode. %prep @@ -94,11 +94,6 @@ sh test_all.sh %changelog -* Tue Jan 09 2018 Matthieu Saulnier - 4.0.0-1 -- Update to new upstream release (4.0.0) RHBZ#1510097 - - SDL 2.0 is required instead of SDL 1.2 for tests -- Fix french translation in spec file - * Thu Aug 03 2017 Fedora Release Engineering - 3.4.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild diff --git a/sources b/sources index be10bad..80b0c32 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qrencode-4.0.0.tar.bz2) = d4140d77fce3a1c39735cc3e98e3a19018daaa08c870644f71727d27ffb17711e76b4ed4e51718d90d812e78df75fe575617580ea9b1bf210438f8fd1734204e +SHA512 (qrencode-3.4.4.tar.bz2) = 4835d462542e37e5460635e0dd84e291ff0976a6aec61c63f9950c1e60b446bc913220726e14f6379322bfd32ccd9bcd5fceed9ca10cb95343c952d8472b983d From da003bd2e4e96e972ba5fcf4c2ea14d1f941aed2 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sat, 3 Feb 2018 17:36:15 +0100 Subject: [PATCH 29/49] Switch to %ldconfig_scriptlets Signed-off-by: Igor Gnatenko --- qrencode.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/qrencode.spec b/qrencode.spec index fa341f6..e989de9 100644 --- a/qrencode.spec +++ b/qrencode.spec @@ -1,6 +1,6 @@ Name: qrencode Version: 3.4.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Generate QR 2D barcodes Summary(fr): Génère les code-barres en 2D QR @@ -71,10 +71,7 @@ chrpath --delete $RPM_BUILD_ROOT%{_bindir}/qrencode cd ./tests sh test_all.sh - -%post libs -p /sbin/ldconfig - -%postun libs -p /sbin/ldconfig +%ldconfig_scriptlets libs %files @@ -94,6 +91,9 @@ sh test_all.sh %changelog +* Sat Feb 03 2018 Igor Gnatenko - 3.4.4-4 +- Switch to %%ldconfig_scriptlets + * Thu Aug 03 2017 Fedora Release Engineering - 3.4.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From f2e85ee81b033edb240d6eb198600d2481df5dfd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 12:18:26 +0000 Subject: [PATCH 30/49] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- qrencode.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qrencode.spec b/qrencode.spec index e989de9..44d0fbf 100644 --- a/qrencode.spec +++ b/qrencode.spec @@ -1,6 +1,6 @@ Name: qrencode Version: 3.4.4 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Generate QR 2D barcodes Summary(fr): Génère les code-barres en 2D QR @@ -91,6 +91,9 @@ sh test_all.sh %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 3.4.4-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Sat Feb 03 2018 Igor Gnatenko - 3.4.4-4 - Switch to %%ldconfig_scriptlets From 7a9b0e44a1fe76335360cc9054c1d6fcd358c419 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 9 Jul 2018 19:06:50 +0200 Subject: [PATCH 31/49] add BuildRequires: gcc Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot --- qrencode.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/qrencode.spec b/qrencode.spec index 44d0fbf..e46553b 100644 --- a/qrencode.spec +++ b/qrencode.spec @@ -8,6 +8,7 @@ License: LGPLv2+ URL: http://fukuchi.org/works/qrencode/ Source0: http://fukuchi.org/works/qrencode/%{name}-%{version}.tar.bz2 +BuildRequires: gcc BuildRequires: chrpath BuildRequires: libpng-devel BuildRequires: SDL-devel From 7e5e1e1611afd335bcf99cc1687524c5d0de6d08 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 03:04:58 +0000 Subject: [PATCH 32/49] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- qrencode.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qrencode.spec b/qrencode.spec index e46553b..c664cf6 100644 --- a/qrencode.spec +++ b/qrencode.spec @@ -1,6 +1,6 @@ Name: qrencode Version: 3.4.4 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Generate QR 2D barcodes Summary(fr): Génère les code-barres en 2D QR @@ -92,6 +92,9 @@ sh test_all.sh %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 3.4.4-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Fri Feb 09 2018 Fedora Release Engineering - 3.4.4-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 3b03618f617ca065640cd2a3aad3ce4f78b475f8 Mon Sep 17 00:00:00 2001 From: Matthieu Saulnier Date: Sun, 9 Dec 2018 17:23:49 +0100 Subject: [PATCH 33/49] Remove French translation in spec file --- qrencode.spec | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/qrencode.spec b/qrencode.spec index c664cf6..259d417 100644 --- a/qrencode.spec +++ b/qrencode.spec @@ -1,8 +1,7 @@ Name: qrencode Version: 3.4.4 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Generate QR 2D barcodes -Summary(fr): Génère les code-barres en 2D QR License: LGPLv2+ URL: http://fukuchi.org/works/qrencode/ @@ -19,37 +18,23 @@ BuildRequires: autoconf >= 2.69 Qrencode is a utility software using libqrencode to encode string data in a QR Code and save as a PNG image. -%description -l fr -Qrencode est un logiciel utilitaire utilisant libqrencode pour encoder -les données dans un QR Code et sauvegarde dans une image PNG. - %package devel Summary: QR Code encoding library - Development files -Summary(fr): Bibliothèque d'encodage QR Code - Fichiers de développement Requires: %{name}-libs%{?_isa} = %{version}-%{release} %description devel The qrencode-devel package contains libraries and header files for developing applications that use qrencode. -%description devel -l fr -Le paquet qrencode-devel contient les bibliothèques et les fichiers d'en-tête -pour le développement d'applications utilisant qrencode. - %package libs Summary: QR Code encoding library - Shared libraries -Summary(fr): Bibliothèque d'encodage QR Code - Bibliothèque partagée %description libs The qrencode-libs package contains the shared libraries and header files for applications that use qrencode. -%description libs -l fr -Le paquet qrencode-libs contient les bibliothèques partagées et les fichiers -d'en-tête pour les applications utilisant qrencode. - %prep %setup -q @@ -92,6 +77,9 @@ sh test_all.sh %changelog +* Sun Dec 09 2018 Matthieu Saulnier - 3.4.4-7 +- Remove French translation in spec file + * Sat Jul 14 2018 Fedora Release Engineering - 3.4.4-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 0000b93f6c5ce97c411fa1b0bc2116616c05d8a8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 2 Feb 2019 10:37:26 +0000 Subject: [PATCH 34/49] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- qrencode.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qrencode.spec b/qrencode.spec index 259d417..d9e1349 100644 --- a/qrencode.spec +++ b/qrencode.spec @@ -1,6 +1,6 @@ Name: qrencode Version: 3.4.4 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Generate QR 2D barcodes License: LGPLv2+ @@ -77,6 +77,9 @@ sh test_all.sh %changelog +* Sat Feb 02 2019 Fedora Release Engineering - 3.4.4-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Sun Dec 09 2018 Matthieu Saulnier - 3.4.4-7 - Remove French translation in spec file From a36b8a9ef3b44abf2b8eee5d5a18aec88c03f1f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 19 Jun 2019 09:57:50 +0200 Subject: [PATCH 35/49] Drop use of __* macros that were removed in rpm-4.15 --- qrencode.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qrencode.spec b/qrencode.spec index d9e1349..6a62cfe 100644 --- a/qrencode.spec +++ b/qrencode.spec @@ -42,7 +42,7 @@ applications that use qrencode. %build ## Rebuild configure scripts for ARM 64 support. (RHBZ 926414) -%{__autoconf} +autoconf %configure --with-tests make %{?_smp_mflags} From 1704e42d1e7f909301c8c872a78140f5aa7454cd Mon Sep 17 00:00:00 2001 From: Paul Wouters Date: Tue, 25 Jun 2019 16:01:55 -0400 Subject: [PATCH 36/49] * Tue Jun 25 2019 Paul Wouters - 4.0.2-1 - Update to 4.0.2 and cleanup by Vasiliy N. Glazov --- .gitignore | 1 + qrencode.spec | 36 +++++++++++++++--------------------- sources | 2 +- 3 files changed, 17 insertions(+), 22 deletions(-) diff --git a/.gitignore b/.gitignore index 870c7ac..70cac7f 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ qrencode-3.1.1.tar.gz /qrencode-3.4.1.tar.gz /qrencode-3.4.2.tar.bz2 /qrencode-3.4.4.tar.bz2 +/qrencode-4.0.2.tar.bz2 diff --git a/qrencode.spec b/qrencode.spec index 6a62cfe..26da7b5 100644 --- a/qrencode.spec +++ b/qrencode.spec @@ -1,24 +1,23 @@ Name: qrencode -Version: 3.4.4 -Release: 8%{?dist} +Version: 4.0.2 +Release: 1%{?dist} Summary: Generate QR 2D barcodes License: LGPLv2+ URL: http://fukuchi.org/works/qrencode/ -Source0: http://fukuchi.org/works/qrencode/%{name}-%{version}.tar.bz2 +Source0: http://fukuchi.org/works/qrencode/qrencode-%{version}.tar.bz2 BuildRequires: gcc -BuildRequires: chrpath -BuildRequires: libpng-devel -BuildRequires: SDL-devel +BuildRequires: chrpath +BuildRequires: libpng-devel +BuildRequires: SDL-devel ## For ARM 64 support (RHBZ 926414) -BuildRequires: autoconf >= 2.69 +BuildRequires: autoconf >= 2.69 %description Qrencode is a utility software using libqrencode to encode string data in a QR Code and save as a PNG image. - %package devel Summary: QR Code encoding library - Development files Requires: %{name}-libs%{?_isa} = %{version}-%{release} @@ -35,31 +34,24 @@ Summary: QR Code encoding library - Shared libraries The qrencode-libs package contains the shared libraries and header files for applications that use qrencode. - %prep -%setup -q - +%autosetup %build ## Rebuild configure scripts for ARM 64 support. (RHBZ 926414) autoconf %configure --with-tests -make %{?_smp_mflags} - +%make_build %install -make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" -rm -rf $RPM_BUILD_ROOT%{_libdir}/libqrencode.la -chrpath --delete $RPM_BUILD_ROOT%{_bindir}/qrencode - +%make_install INSTALL="install -p" +rm -f %{buildroot}%{_libdir}/libqrencode.la +chrpath --delete %{buildroot}%{_bindir}/qrencode %check cd ./tests sh test_all.sh -%ldconfig_scriptlets libs - - %files %{_bindir}/qrencode %{_mandir}/man1/qrencode.1* @@ -75,8 +67,10 @@ sh test_all.sh %{_libdir}/libqrencode.so %{_libdir}/pkgconfig/libqrencode.pc - %changelog +* Tue Jun 25 2019 Paul Wouters - 4.0.2-1 +- Update to 4.0.2 and cleanup by Vasiliy N. Glazov + * Sat Feb 02 2019 Fedora Release Engineering - 3.4.4-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index 80b0c32..eaa7c7a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qrencode-3.4.4.tar.bz2) = 4835d462542e37e5460635e0dd84e291ff0976a6aec61c63f9950c1e60b446bc913220726e14f6379322bfd32ccd9bcd5fceed9ca10cb95343c952d8472b983d ++SHA512 (qrencode-4.0.2.tar.bz2) = 2429c7938e32eacbaf327c029c7745ba33259f879661a8b6470cc617c780daf5bd1d5689599151df62e84badd2568eccab6c12f157331e512ab24a3899e0f002 From f48205000af5397008dbd645abb941e0dbb49636 Mon Sep 17 00:00:00 2001 From: Paul Wouters Date: Tue, 25 Jun 2019 16:08:12 -0400 Subject: [PATCH 37/49] update sources. --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index eaa7c7a..fc8bdb9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -+SHA512 (qrencode-4.0.2.tar.bz2) = 2429c7938e32eacbaf327c029c7745ba33259f879661a8b6470cc617c780daf5bd1d5689599151df62e84badd2568eccab6c12f157331e512ab24a3899e0f002 +SHA512 (qrencode-4.0.2.tar.bz2) = 2429c7938e32eacbaf327c029c7745ba33259f879661a8b6470cc617c780daf5bd1d5689599151df62e84badd2568eccab6c12f157331e512ab24a3899e0f002 From 09e734ba1e283536dc56f9c292deb6b6f91fede2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Wed, 26 Jun 2019 00:32:04 +0200 Subject: [PATCH 38/49] Implement bootstrap logic for so-name bumps --- qrencode.spec | 64 +++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 59 insertions(+), 5 deletions(-) diff --git a/qrencode.spec b/qrencode.spec index 26da7b5..f55235b 100644 --- a/qrencode.spec +++ b/qrencode.spec @@ -1,11 +1,26 @@ +# Recent so-version, so we do not bump accidentally. +%global so_ver 4 + +# Set to 1 when building a bootstrap for a bumped so-name. +%global bootstrap 1 + +%if 0%{?bootstrap} +%global version_old 3.4.4 +%global so_ver_old 3 +%endif + + Name: qrencode Version: 4.0.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Generate QR 2D barcodes License: LGPLv2+ URL: http://fukuchi.org/works/qrencode/ Source0: http://fukuchi.org/works/qrencode/qrencode-%{version}.tar.bz2 +%if 0%{?bootstrap} +Source1: http://fukuchi.org/works/qrencode/qrencode-%{version_old}.tar.bz2 +%endif BuildRequires: gcc BuildRequires: chrpath @@ -18,6 +33,7 @@ BuildRequires: autoconf >= 2.69 Qrencode is a utility software using libqrencode to encode string data in a QR Code and save as a PNG image. + %package devel Summary: QR Code encoding library - Development files Requires: %{name}-libs%{?_isa} = %{version}-%{release} @@ -34,8 +50,17 @@ Summary: QR Code encoding library - Shared libraries The qrencode-libs package contains the shared libraries and header files for applications that use qrencode. + %prep -%autosetup +%autosetup -Tb 0 -p 1 + +%if 0%{?bootstrap} +mkdir -p bootstrap_ver +pushd bootstrap_ver +tar --strip-components=1 -xf %{SOURCE1} +popd +%endif + %build ## Rebuild configure scripts for ARM 64 support. (RHBZ 926414) @@ -43,31 +68,60 @@ autoconf %configure --with-tests %make_build +%if 0%{?bootstrap} +pushd bootstrap_ver +autoconf +%configure --with-tests +%make_build +popd +%endif + + %install -%make_install INSTALL="install -p" +%if 0%{?bootstrap} +%make_install -C bootstrap_ver +%{_bindir}/find %{buildroot} -xtype f -not \ + -name 'lib%{name}.so.%{so_ver_old}*' -delete -print +%{_bindir}/find %{buildroot} -type l -not \ + -name 'lib%{name}.so.%{so_ver_old}*' -delete -print +%endif + +%make_install rm -f %{buildroot}%{_libdir}/libqrencode.la chrpath --delete %{buildroot}%{_bindir}/qrencode + %check -cd ./tests +pushd ./tests sh test_all.sh +popd + %files %{_bindir}/qrencode %{_mandir}/man1/qrencode.1* + %files libs %{!?_licensedir:%global license %%doc} %license COPYING %doc ChangeLog NEWS README TODO -%{_libdir}/libqrencode.so.* +%{_libdir}/libqrencode.so.%{so_ver}* +%if 0%{?bootstrap} +%{_libdir}/libqrencode.so.%{so_ver_old}* +%endif + %files devel %{_includedir}/qrencode.h %{_libdir}/libqrencode.so %{_libdir}/pkgconfig/libqrencode.pc + %changelog +* Tue Jun 25 2019 Björn Esser - 4.0.2-2 +- Implement bootstrap logic for so-name bumps + * Tue Jun 25 2019 Paul Wouters - 4.0.2-1 - Update to 4.0.2 and cleanup by Vasiliy N. Glazov From ab7bf0f2dfa4b4ccf836d596297072f04c2f5d1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Wed, 26 Jun 2019 00:33:20 +0200 Subject: [PATCH 39/49] Add old version to sources --- sources | 1 + 1 file changed, 1 insertion(+) diff --git a/sources b/sources index fc8bdb9..4b9f2c7 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ +SHA512 (qrencode-3.4.4.tar.bz2) = 4835d462542e37e5460635e0dd84e291ff0976a6aec61c63f9950c1e60b446bc913220726e14f6379322bfd32ccd9bcd5fceed9ca10cb95343c952d8472b983d SHA512 (qrencode-4.0.2.tar.bz2) = 2429c7938e32eacbaf327c029c7745ba33259f879661a8b6470cc617c780daf5bd1d5689599151df62e84badd2568eccab6c12f157331e512ab24a3899e0f002 From adc4fcf9caf81fb866b259babe1e21a228ec159c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Wed, 26 Jun 2019 00:57:31 +0200 Subject: [PATCH 40/49] Disable bootstrap after systemd rebuild --- qrencode.spec | 11 +++++++---- sources | 1 - 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/qrencode.spec b/qrencode.spec index f55235b..1b95b2c 100644 --- a/qrencode.spec +++ b/qrencode.spec @@ -2,17 +2,17 @@ %global so_ver 4 # Set to 1 when building a bootstrap for a bumped so-name. -%global bootstrap 1 +%global bootstrap 0 %if 0%{?bootstrap} -%global version_old 3.4.4 -%global so_ver_old 3 +%global version_old 4.0.2 +%global so_ver_old 4 %endif Name: qrencode Version: 4.0.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Generate QR 2D barcodes License: LGPLv2+ @@ -119,6 +119,9 @@ popd %changelog +* Tue Jun 25 2019 Björn Esser - 4.0.2-3 +- Disable bootstrap after systemd rebuild + * Tue Jun 25 2019 Björn Esser - 4.0.2-2 - Implement bootstrap logic for so-name bumps diff --git a/sources b/sources index 4b9f2c7..fc8bdb9 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (qrencode-3.4.4.tar.bz2) = 4835d462542e37e5460635e0dd84e291ff0976a6aec61c63f9950c1e60b446bc913220726e14f6379322bfd32ccd9bcd5fceed9ca10cb95343c952d8472b983d SHA512 (qrencode-4.0.2.tar.bz2) = 2429c7938e32eacbaf327c029c7745ba33259f879661a8b6470cc617c780daf5bd1d5689599151df62e84badd2568eccab6c12f157331e512ab24a3899e0f002 From 64f7fdc21e03b66afe95c28b8288ae3aa5a98fac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Wed, 26 Jun 2019 00:58:16 +0200 Subject: [PATCH 41/49] Remove unused patch from repo --- qrencode-fix-LIBPTHREAD-macro.patch | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 qrencode-fix-LIBPTHREAD-macro.patch diff --git a/qrencode-fix-LIBPTHREAD-macro.patch b/qrencode-fix-LIBPTHREAD-macro.patch deleted file mode 100644 index ab804bf..0000000 --- a/qrencode-fix-LIBPTHREAD-macro.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- ./libqrencode.pc.in.orig 2012-02-20 15:36:29.983533958 -0800 -+++ ./libqrencode.pc.in 2012-02-20 15:56:41.252501662 -0800 -@@ -6,5 +6,5 @@ includedir=@includedir@ - Name: libqrencode - Description: A QR Code encoding library - Version: @VERSION@ --Libs: -L${libdir} -lqrencode @LIBPTHREAD@ -+Libs: -L${libdir} -lqrencode -pthread - Cflags: -I${includedir} From 15248b7702882db19f10998f7c85c5de9c8c4bcd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jul 2019 17:42:42 +0000 Subject: [PATCH 42/49] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- qrencode.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qrencode.spec b/qrencode.spec index 1b95b2c..580c8ed 100644 --- a/qrencode.spec +++ b/qrencode.spec @@ -12,7 +12,7 @@ Name: qrencode Version: 4.0.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Generate QR 2D barcodes License: LGPLv2+ @@ -119,6 +119,9 @@ popd %changelog +* Fri Jul 26 2019 Fedora Release Engineering - 4.0.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Tue Jun 25 2019 Björn Esser - 4.0.2-3 - Disable bootstrap after systemd rebuild From cfcf1a6c65340a73e400e80754d064d24af05717 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 30 Jan 2020 16:48:59 +0000 Subject: [PATCH 43/49] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- qrencode.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qrencode.spec b/qrencode.spec index 580c8ed..83ee8b5 100644 --- a/qrencode.spec +++ b/qrencode.spec @@ -12,7 +12,7 @@ Name: qrencode Version: 4.0.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Generate QR 2D barcodes License: LGPLv2+ @@ -119,6 +119,9 @@ popd %changelog +* Thu Jan 30 2020 Fedora Release Engineering - 4.0.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Fri Jul 26 2019 Fedora Release Engineering - 4.0.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 170ccf789d545614387d2d5a78de2724bf16d9cd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 05:06:35 +0000 Subject: [PATCH 44/49] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- qrencode.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qrencode.spec b/qrencode.spec index 83ee8b5..c6b7749 100644 --- a/qrencode.spec +++ b/qrencode.spec @@ -12,7 +12,7 @@ Name: qrencode Version: 4.0.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Generate QR 2D barcodes License: LGPLv2+ @@ -119,6 +119,9 @@ popd %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 4.0.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Thu Jan 30 2020 Fedora Release Engineering - 4.0.2-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From d1df82d26a6f8fc07cdbe5024bc8af072e169005 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Sat, 9 Jan 2021 05:50:18 +0000 Subject: [PATCH 45/49] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- qrencode.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/qrencode.spec b/qrencode.spec index c6b7749..51b61b7 100644 --- a/qrencode.spec +++ b/qrencode.spec @@ -22,6 +22,7 @@ Source0: http://fukuchi.org/works/qrencode/qrencode-%{version}.tar.bz2 Source1: http://fukuchi.org/works/qrencode/qrencode-%{version_old}.tar.bz2 %endif +BuildRequires: make BuildRequires: gcc BuildRequires: chrpath BuildRequires: libpng-devel From ed8b90b50b59981f0871e3e00ea3594897bc66a2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 14:39:07 +0000 Subject: [PATCH 46/49] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- qrencode.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qrencode.spec b/qrencode.spec index 51b61b7..544432f 100644 --- a/qrencode.spec +++ b/qrencode.spec @@ -12,7 +12,7 @@ Name: qrencode Version: 4.0.2 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Generate QR 2D barcodes License: LGPLv2+ @@ -120,6 +120,9 @@ popd %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 4.0.2-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Jul 29 2020 Fedora Release Engineering - 4.0.2-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From ef20b502b6fafd7e8bdfab33f4e615144af66d2e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 10:43:56 +0000 Subject: [PATCH 47/49] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- qrencode.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qrencode.spec b/qrencode.spec index 544432f..60b9014 100644 --- a/qrencode.spec +++ b/qrencode.spec @@ -12,7 +12,7 @@ Name: qrencode Version: 4.0.2 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Generate QR 2D barcodes License: LGPLv2+ @@ -120,6 +120,9 @@ popd %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 4.0.2-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Wed Jan 27 2021 Fedora Release Engineering - 4.0.2-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 18857cf8d17a57b77738bd8732cc2e475532f10b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcus=20M=C3=BCller?= Date: Tue, 23 Nov 2021 21:32:24 +0100 Subject: [PATCH 48/49] Update to 4.1.1 --- .gitignore | 1 + qrencode.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 70cac7f..7aa03dc 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ qrencode-3.1.1.tar.gz /qrencode-3.4.2.tar.bz2 /qrencode-3.4.4.tar.bz2 /qrencode-4.0.2.tar.bz2 +/qrencode-4.1.1.tar.bz2 diff --git a/qrencode.spec b/qrencode.spec index 60b9014..e922606 100644 --- a/qrencode.spec +++ b/qrencode.spec @@ -5,14 +5,14 @@ %global bootstrap 0 %if 0%{?bootstrap} -%global version_old 4.0.2 +%global version_old 4.1.1 %global so_ver_old 4 %endif Name: qrencode -Version: 4.0.2 -Release: 8%{?dist} +Version: 4.1.1 +Release: 1%{?dist} Summary: Generate QR 2D barcodes License: LGPLv2+ @@ -120,6 +120,9 @@ popd %changelog +* Tue Nov 23 2021 Marcus Müller - 4.1.1-1 +- Update to 4.1.1 + * Fri Jul 23 2021 Fedora Release Engineering - 4.0.2-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index fc8bdb9..727daa8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qrencode-4.0.2.tar.bz2) = 2429c7938e32eacbaf327c029c7745ba33259f879661a8b6470cc617c780daf5bd1d5689599151df62e84badd2568eccab6c12f157331e512ab24a3899e0f002 +SHA512 (qrencode-4.1.1.tar.bz2) = 981b3242c213e1b40ac88711912dd8c27ea11f3437d1a04b6b226499a6e991a8f0b3b10f818bcc104812192a1dac4ce05f16ecd847a50cb03d4859b84bad89b8 From 61d9a8abb24443b1613973dd7dbbf6a420491e37 Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Tue, 31 Oct 2023 00:11:19 +0300 Subject: [PATCH 49/49] Remove unnecessary files --- sources | 1 - tests/smoke/Makefile | 62 ------------------------------------------ tests/smoke/PURPOSE | 3 -- tests/smoke/runtest.sh | 54 ------------------------------------ tests/tests.yml | 12 -------- 5 files changed, 132 deletions(-) delete mode 100644 sources delete mode 100644 tests/smoke/Makefile delete mode 100644 tests/smoke/PURPOSE delete mode 100755 tests/smoke/runtest.sh delete mode 100644 tests/tests.yml diff --git a/sources b/sources deleted file mode 100644 index 727daa8..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (qrencode-4.1.1.tar.bz2) = 981b3242c213e1b40ac88711912dd8c27ea11f3437d1a04b6b226499a6e991a8f0b3b10f818bcc104812192a1dac4ce05f16ecd847a50cb03d4859b84bad89b8 diff --git a/tests/smoke/Makefile b/tests/smoke/Makefile deleted file mode 100644 index 8385e9f..0000000 --- a/tests/smoke/Makefile +++ /dev/null @@ -1,62 +0,0 @@ -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Makefile of /CoreOS/qrencode/Sanity/smoke -# Description: Check sanity of qrencode -# Author: Petr Splichal -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Copyright (c) 2017 Red Hat, Inc. -# -# This program is free software: you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation, either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be -# useful, but WITHOUT ANY WARRANTY; without even the implied -# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -# PURPOSE. See the GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see http://www.gnu.org/licenses/. -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -export TEST=/CoreOS/qrencode/Sanity/smoke -export TESTVERSION=1.0 - -BUILT_FILES= - -FILES=$(METADATA) runtest.sh Makefile PURPOSE - -.PHONY: all install download clean - -run: $(FILES) build - ./runtest.sh - -build: $(BUILT_FILES) - test -x runtest.sh || chmod a+x runtest.sh - -clean: - rm -f *~ $(BUILT_FILES) - - -include /usr/share/rhts/lib/rhts-make.include - -$(METADATA): Makefile - @echo "Owner: Petr Splichal " > $(METADATA) - @echo "Name: $(TEST)" >> $(METADATA) - @echo "TestVersion: $(TESTVERSION)" >> $(METADATA) - @echo "Path: $(TEST_DIR)" >> $(METADATA) - @echo "Description: Check sanity of qrencode" >> $(METADATA) - @echo "Type: Sanity" >> $(METADATA) - @echo "TestTime: 5m" >> $(METADATA) - @echo "RunFor: qrencode" >> $(METADATA) - @echo "Requires: qrencode file" >> $(METADATA) - @echo "Priority: Normal" >> $(METADATA) - @echo "License: GPLv2+" >> $(METADATA) - @echo "Confidential: no" >> $(METADATA) - @echo "Destructive: no" >> $(METADATA) - - rhts-lint $(METADATA) diff --git a/tests/smoke/PURPOSE b/tests/smoke/PURPOSE deleted file mode 100644 index f2d820f..0000000 --- a/tests/smoke/PURPOSE +++ /dev/null @@ -1,3 +0,0 @@ -PURPOSE of /CoreOS/qrencode/Sanity/smoke -Description: Check sanity of qrencode -Author: Petr Splichal diff --git a/tests/smoke/runtest.sh b/tests/smoke/runtest.sh deleted file mode 100755 index 52e35dd..0000000 --- a/tests/smoke/runtest.sh +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/bash -# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# runtest.sh of /CoreOS/qrencode/Sanity/smoke -# Description: Check sanity of qrencode -# Author: Petr Splichal -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Copyright (c) 2017 Red Hat, Inc. -# -# This program is free software: you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation, either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be -# useful, but WITHOUT ANY WARRANTY; without even the implied -# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -# PURPOSE. See the GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see http://www.gnu.org/licenses/. -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -# Include Beaker environment -. /usr/bin/rhts-environment.sh || exit 1 -. /usr/share/beakerlib/beakerlib.sh || exit 1 - -PACKAGE="qrencode" - -rlJournalStart - rlPhaseStartSetup - rlAssertRpm $PACKAGE - rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory" - rlRun "pushd $TmpDir" - rlPhaseEnd - - rlPhaseStartTest - for type in png eps svg; do - rlRun "qrencode abcdefg -t $type -o qr.$type" - rlRun "file qr.$type | tee output" - rlAssertGrep "$type" "output" "-iq" - done - rlPhaseEnd - - rlPhaseStartCleanup - rlRun "popd" - rlRun "rm -r $TmpDir" 0 "Removing tmp directory" - rlPhaseEnd -rlJournalPrintText -rlJournalEnd diff --git a/tests/tests.yml b/tests/tests.yml deleted file mode 100644 index e410357..0000000 --- a/tests/tests.yml +++ /dev/null @@ -1,12 +0,0 @@ -- hosts: localhost - roles: - - role: standard-test-beakerlib - tags: - - classic - - container - - atomic - tests: - - smoke - required_packages: - - qrencode - - file