.gitignore

@@ -1 +1 @@
-SOURCES/libpaper_1.1.28.tar.gz
+SOURCES/libpaper_1.1.24+nmu4.tar.gz

.libpaper.metadata

@@ -1 +1 @@
-c6583fbdaebe091d11d81c4e59514e58996f22ba SOURCES/libpaper_1.1.28.tar.gz
+830c7e5c0f77d4f8a314ba3ea93dfd954bdd3a4e SOURCES/libpaper_1.1.24+nmu4.tar.gz

SOURCES/libpaper-covscan.patch

@@ -0,0 +1,16 @@
+diff --git a/lib/paper.c b/lib/paper.c
+index 57db599..8817aea 100644
+--- a/lib/paper.c
++++ b/lib/paper.c
+@@ -211,7 +211,10 @@ PAPERSIZEVAR, fall-back to the old behaviour.
+ 		fclose(ps);
+ 
+ 		paperstr = malloc((strlen(papername) + 1) * sizeof(char));
+-		if (! paperstr) return 0;
++		if (! paperstr) {
++		    free(papername);
++		    return 0;
++		}
+ 
+ 		strcpy(paperstr, papername);
+ 		free(papername);

SPECS/libpaper.spec

@@ -1,29 +1,22 @@
-#%%global nmu +nmu4
+%global nmu +nmu4
 
 Name:		libpaper
-Version:	1.1.28
+Version:	1.1.24
-Release:	4%{?dist}
+Release:	22%{?dist}
 Summary:	Library and tools for handling papersize
 License:	GPLv2
 URL:		http://packages.qa.debian.org/libp/libpaper.html
-Source0:	http://ftp.debian.org/debian/pool/main/libp/libpaper/%{name}_%{version}.tar.gz
+Source0:	http://ftp.debian.org/debian/pool/main/libp/libpaper/%{name}_%{version}%{nmu}.tar.gz
-
-
 # Filed upstream as:
 # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=481213
 Patch2:		libpaper-useglibcfallback.patch
 # Memory leak
 Patch3:   libpaper-file-leak.patch
-# memory leak found by covscan, reported to debian upstream
+# 1606989 - Please review important issues found by covscan in "libpaper-1.1.24-21.el8+7" package
-#Patch4: libpaper-covscan.patch
+Patch4: libpaper-covscan.patch
-
 
 # gcc is no longer in buildroot by default
 BuildRequires:  gcc
-# use git for autosetup
-BuildRequires:  git-core
-# uses make
-BuildRequires:  make
 BuildRequires:	libtool, gettext, gawk
 
 %description
@@ -43,23 +36,25 @@ This package contains headers and libraries that programmers will need
 to develop applications which use libpaper.
 
 %prep
-%autosetup -S git
+%setup -q -n %{name}-%{version}%{nmu}
+%patch2 -p1 -b .useglibcfallback
+%patch3 -p1 -b .file-leak
+%patch4 -p1 -b .covscan
 libtoolize
 
 %build
 touch AUTHORS NEWS
 aclocal
-autoheader
 autoconf
 automake -a
 %configure --disable-static
 # Disable rpath
 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_build
+make %{?_smp_mflags}
 
 %install
-%make_install
+make DESTDIR=$RPM_BUILD_ROOT install
 rm $RPM_BUILD_ROOT%{_libdir}/*.la
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
 echo '# Simply write the paper name. See papersize(5) for possible values' > $RPM_BUILD_ROOT%{_sysconfdir}/papersize
@@ -91,40 +86,8 @@ done
 %{_mandir}/man3/*
 
 %changelog
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.1.28-4
+* Mon Dec 03 2018 Zdenek Dohnal <zdohnal@redhat.com> - 1.1.24-22
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+- 1606989 - Please review important issues found by covscan in "libpaper-1.1.24-21.el8+7" package
-  Related: rhbz#1991688
-
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.1.28-3
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.28-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Thu Nov 05 2020 Zdenek Dohnal <zdohnal@redhat.com> - 1.1.28-1
-- 1.1.28
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.24-28
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Mon Jul 13 2020 Tom Stellard <tstellar@redhat.com> - 1.1.24-27
-- Use make macros
-- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro
-
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.24-26
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.24-25
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.24-24
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Mon Dec 03 2018 Zdenek Dohnal <zdohnal@redhat.com> - 1.1.24-23
-- fixing covscan issue - memory leak
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.24-22
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
 * Fri Mar 09 2018 Zdenek Dohnal <zdohnal@redhat.com> - 1.1.24-21
 - remove nmu5 from .gitignore and sources