10 changed files with 240 additions and 34 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1,7 @@
-SOURCES/qrencode-3.4.4.tar.bz2
+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
+/qrencode-3.4.4.tar.bz2
+/qrencode-4.0.2.tar.bz2
--- a/.qrencode.metadata
+++ b/.qrencode.metadata
@ -1 +0,0 @@
-6de54316081e5528e415b250730dcddbfdaa4b0e SOURCES/qrencode-3.4.4.tar.bz2
--- a/dead.package
+++ b/dead.package
@ -0,0 +1 @@
+qrencode package is retired on c9s for CS-601
--- a/gating.yaml
+++ b/gating.yaml
@ -0,0 +1,6 @@
+--- !Policy
+product_versions:
+  - rhel-9
+decision_context: osci_compose_gate
+rules:
+  - !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional}
--- a/SPECS/qrencode.spec
+++ b/SPECS/qrencode.spec
@ -1,88 +1,117 @@
+# 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   0
+
+%if 0%{?bootstrap}
+%global version_old 4.0.2
+%global so_ver_old  4
+%endif
+
+
 Name:           qrencode
-Version:        3.4.4
-Release:        5%{?dist}
+Version:        4.0.2
+Release:        8%{?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/
-Source0:        http://fukuchi.org/works/qrencode/%{name}-%{version}.tar.bz2
+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:	chrpath
-BuildRequires:	libpng-devel
-BuildRequires:	SDL-devel
+BuildRequires: make
+BuildRequires:  gcc
+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.

-%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
+%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)
-%{__autoconf}
+autoconf
 %configure --with-tests
-make %{?_smp_mflags}
+%make_build
+
+%if 0%{?bootstrap}
+pushd bootstrap_ver
+autoconf
+%configure --with-tests
+%make_build
+popd
+%endif


 %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
+%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
-
-%ldconfig_scriptlets libs
+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
@ -91,6 +120,39 @@ sh test_all.sh


 %changelog
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 4.0.2-8
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.2-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.2-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.2-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Tue Jun 25 2019 Björn Esser <besser82@fedoraproject.org> - 4.0.2-3
+- Disable bootstrap after systemd rebuild
+
+* Tue Jun 25 2019 Björn Esser <besser82@fedoraproject.org> - 4.0.2-2
+- Implement bootstrap logic for so-name bumps
+
+* Tue Jun 25 2019 Paul Wouters <pwouters@redhat.com> - 4.0.2-1
+- Update to 4.0.2 and cleanup by Vasiliy N. Glazov <vascom2@gmail.com>
+
+* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.4-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Sun Dec 09 2018 Matthieu Saulnier <fantom@fedoraproject.org> - 3.4.4-7
+- Remove French translation in spec file
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.4-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
 * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.4-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

--- a/1
+++ b/1
@ -0,0 +1 @@
+SHA512 (qrencode-4.0.2.tar.bz2) = 2429c7938e32eacbaf327c029c7745ba33259f879661a8b6470cc617c780daf5bd1d5689599151df62e84badd2568eccab6c12f157331e512ab24a3899e0f002
--- a/tests/smoke/Makefile
+++ b/tests/smoke/Makefile
@ -0,0 +1,62 @@
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Makefile of /CoreOS/qrencode/Sanity/smoke
+#   Description: Check sanity of qrencode
+#   Author: Petr Splichal <psplicha@redhat.com>
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   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 <psplicha@redhat.com>" > $(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)
--- a/tests/smoke/PURPOSE
+++ b/tests/smoke/PURPOSE
@ -0,0 +1,3 @@
+PURPOSE of /CoreOS/qrencode/Sanity/smoke
+Description: Check sanity of qrencode
+Author: Petr Splichal <psplicha@redhat.com>
--- a/tests/smoke/runtest.sh
+++ 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 <psplicha@redhat.com>
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   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
--- a/tests/tests.yml
+++ 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
				`@ -1 +0,0 @@`
				`6de54316081e5528e415b250730dcddbfdaa4b0e SOURCES/qrencode-3.4.4.tar.bz2`
				`@ -0,0 +1 @@`
				`qrencode package is retired on c9s for CS-601`
				`@ -0,0 +1 @@`
				`SHA512 (qrencode-4.0.2.tar.bz2) = 2429c7938e32eacbaf327c029c7745ba33259f879661a8b6470cc617c780daf5bd1d5689599151df62e84badd2568eccab6c12f157331e512ab24a3899e0f002`