From 95ba5da931c58aedc1381752c5af9eb72fb7d7bd Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Sat, 12 Jul 2014 18:52:30 -0400 Subject: [PATCH 1/3] fix license handling --- less.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/less.spec b/less.spec index bdd9768..14f7de8 100644 --- a/less.spec +++ b/less.spec @@ -1,7 +1,7 @@ Summary: A text file browser similar to more, but better Name: less Version: 458 -Release: 11%{?dist} +Release: 12%{?dist} License: GPLv3+ Group: Applications/Text Source: http://www.greenwoodsoftware.com/less/%{name}-%{version}.tar.gz @@ -67,7 +67,8 @@ ls -la $RPM_BUILD_ROOT/etc/profile.d %files %defattr(-,root,root,-) -%doc LICENSE +%{!?_licensedir:%global license %%doc} +%license LICENSE /etc/profile.d/* %{_bindir}/* %{_mandir}/man1/* @@ -76,6 +77,9 @@ ls -la $RPM_BUILD_ROOT/etc/profile.d rm -rf $RPM_BUILD_ROOT %changelog +* Sat Jul 12 2014 Tom Callaway - 458-12 +- fix license handling + * Mon Jun 23 2014 Jozef Mlich - 458-11 - rollback of previous problem. See explanation of upstream. http://greenwoodsoftware.com/less/faq.html#profileout From ac423bab0c9d5ca9930e641b352d777a19235de3 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sun, 17 Aug 2014 01:49:38 +0000 Subject: [PATCH 2/3] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- less.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/less.spec b/less.spec index 14f7de8..299e18f 100644 --- a/less.spec +++ b/less.spec @@ -1,7 +1,7 @@ Summary: A text file browser similar to more, but better Name: less Version: 458 -Release: 12%{?dist} +Release: 13%{?dist} License: GPLv3+ Group: Applications/Text Source: http://www.greenwoodsoftware.com/less/%{name}-%{version}.tar.gz @@ -77,6 +77,9 @@ ls -la $RPM_BUILD_ROOT/etc/profile.d rm -rf $RPM_BUILD_ROOT %changelog +* Sun Aug 17 2014 Fedora Release Engineering - 458-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Sat Jul 12 2014 Tom Callaway - 458-12 - fix license handling From e4fc7bdaff90209b859f8bd17a2017b5b78e892b Mon Sep 17 00:00:00 2001 From: Viktor Jancik Date: Mon, 3 Aug 2015 15:44:43 +0200 Subject: [PATCH 3/3] Updated spec file --- less.spec | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/less.spec b/less.spec index 483c4d9..413f090 100644 --- a/less.spec +++ b/less.spec @@ -1,7 +1,7 @@ Summary: A text file browser similar to more, but better Name: less Version: 471 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv3+ Group: Applications/Text Source: http://www.greenwoodsoftware.com/less/%{name}-%{version}.tar.gz @@ -47,36 +47,32 @@ files, and you'll use it frequently. %patch10 -p1 -b .lesskey-usage %patch11 -p1 -b .old-bot %patch12 -p2 -b .out_of_bounds_read.patch -autoreconf - -chmod -R a+w * -chmod 644 *.c *.h LICENSE README %build +rm -f ./configure +autoreconf -fiv %configure -make CC="gcc $RPM_OPT_FLAGS -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" datadir=%{_docdir} +make %{?_smp_mflags} CFLAGS="%{optflags} -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" %install -rm -rf $RPM_BUILD_ROOT -make DESTDIR=$RPM_BUILD_ROOT install +%make_install mkdir -p $RPM_BUILD_ROOT/etc/profile.d -install -p -c -m 755 %{SOURCE1} $RPM_BUILD_ROOT/%{_bindir} -install -p -c -m 644 %{SOURCE2} $RPM_BUILD_ROOT/etc/profile.d -install -p -c -m 644 %{SOURCE3} $RPM_BUILD_ROOT/etc/profile.d -ls -la $RPM_BUILD_ROOT/etc/profile.d +install -p %{SOURCE1} $RPM_BUILD_ROOT/%{_bindir} +install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT/etc/profile.d +install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT/etc/profile.d %files -%defattr(-,root,root,-) -%{!?_licensedir:%global license %%doc} +%doc README NEWS INSTALL COPYING %license LICENSE /etc/profile.d/* %{_bindir}/* %{_mandir}/man1/* -%clean -rm -rf $RPM_BUILD_ROOT - %changelog +* Mon Aug 03 2015 Viktor Jancik - 471-5 +- Updated spec file to comply with current Fedora Packaging Guidelines + Added missing documentation files + * Mon Jun 01 2015 Jozef Mlich - 471-4 - update of previous patch