From 2a87077ec369a810a45a7ea06f615ca8bc7239c1 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Sat, 11 Aug 2007 21:54:28 +0000 Subject: [PATCH 1/6] Initialize branch EL-5 for arj --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..42f697a --- /dev/null +++ b/branch @@ -0,0 +1 @@ +EL-5 From 3ceb835280675864ae719004b32031bcf6b7ee37 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Mon, 13 Aug 2007 21:08:38 +0000 Subject: [PATCH 2/6] Rebuilt for EPEL branches (#250845) --- arj.spec | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/arj.spec b/arj.spec index 5755514..9282490 100644 --- a/arj.spec +++ b/arj.spec @@ -1,9 +1,9 @@ Name: arj Version: 3.10.22 -Release: 1%{?dist} +Release: 3%{?dist} Summary: Archiver for .arj files Group: Applications/Archiving -License: GPL +License: GPL+ URL: http://arj.sourceforge.net/ Source0: http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tar.gz # unarj.* from Debian. @@ -67,5 +67,11 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Aug 13 2007 Robert Scheck 3.10.22-3 +- Rebuilt for EPEL branches (#250845) + +* Fri Aug 3 2007 Hans de Goede 3.10.22-2 +- Update License tag for new Licensing Guidelines compliance + * Sat Sep 9 2006 Hans de Goede 3.10.22-1 - initial FE submission based on a src.rpm by Ville Skyttä From 246f8d57ec0d4cd7810625f4d1823f32a9d12f04 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Sat, 30 Aug 2008 14:13:26 +0000 Subject: [PATCH 3/6] - Corrected from %patch to %patch0 to make rpm > 4.4 happy - Fix missing prototype compiler warnings --- arj-3.10.22-missing-protos.patch | 34 ++++++++++++++++++++++++++++++++ arj.spec | 18 ++++++++++++----- 2 files changed, 47 insertions(+), 5 deletions(-) create mode 100644 arj-3.10.22-missing-protos.patch diff --git a/arj-3.10.22-missing-protos.patch b/arj-3.10.22-missing-protos.patch new file mode 100644 index 0000000..90061e5 --- /dev/null +++ b/arj-3.10.22-missing-protos.patch @@ -0,0 +1,34 @@ +diff -up arj-3.10.22/environ.c~ arj-3.10.22/environ.c +--- arj-3.10.22/environ.c~ 2008-03-31 15:19:36.000000000 +0200 ++++ arj-3.10.22/environ.c 2008-03-31 15:19:36.000000000 +0200 +@@ -12,6 +12,8 @@ + #include + #include + #include ++#else ++#include + #endif + + #include +diff -up arj-3.10.22/arjsfx.c~ arj-3.10.22/arjsfx.c +--- arj-3.10.22/arjsfx.c~ 2008-03-31 15:17:45.000000000 +0200 ++++ arj-3.10.22/arjsfx.c 2008-03-31 15:17:45.000000000 +0200 +@@ -5,6 +5,7 @@ + * + */ + ++#define _GNU_SOURCE + #include + #include + +diff -up arj-3.10.22/arj.c~ arj-3.10.22/arj.c +--- arj-3.10.22/arj.c~ 2008-03-31 15:17:14.000000000 +0200 ++++ arj-3.10.22/arj.c 2008-03-31 15:17:14.000000000 +0200 +@@ -5,6 +5,7 @@ + * + */ + ++#define _GNU_SOURCE + #include + #include + diff --git a/arj.spec b/arj.spec index 9282490..f0b0aab 100644 --- a/arj.spec +++ b/arj.spec @@ -1,15 +1,16 @@ Name: arj Version: 3.10.22 -Release: 3%{?dist} +Release: 5%{?dist} Summary: Archiver for .arj files Group: Applications/Archiving License: GPL+ URL: http://arj.sourceforge.net/ -Source0: http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tar.gz +Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz # unarj.* from Debian. Source1: unarj.sh Source2: unarj.1 Patch0: http://ftp.debian.org/debian/pool/main/a/%{name}/%{name}_%{version}-2.diff.gz +Patch1: arj-3.10.22-missing-protos.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: autoconf Provides: unarj = %{version}-%{release} @@ -24,10 +25,11 @@ provided by ARJ Software, Inc. %prep %setup -q -%patch -p1 +%patch0 -p1 for i in debian/patches/00*.patch; do patch -p1 < $i done +%patch1 -p1 pushd gnu autoconf popd @@ -67,8 +69,14 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Mon Aug 13 2007 Robert Scheck 3.10.22-3 -- Rebuilt for EPEL branches (#250845) +* Sat Aug 30 2008 Robert Scheck 3.10.22-5 +- Corrected from %%patch to %%patch0 to make rpm > 4.4 happy + +* Mon Mar 31 2008 Hans de Goede 3.10.22-4 +- Fix missing prototype compiler warnings + +* Tue Feb 19 2008 Fedora Release Engineering - 3.10.22-3 +- Autorebuild for GCC 4.3 * Fri Aug 3 2007 Hans de Goede 3.10.22-2 - Update License tag for new Licensing Guidelines compliance From 3d08bcf9ec3182bc15ea1ddeb3c0c48228771926 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Mon, 8 Sep 2008 20:33:56 +0000 Subject: [PATCH 4/6] - Added patch to refer to original author in the manual page - Added patch to support parallel builds in upstream Makefile --- .cvsignore | 2 +- arj.spec | 72 ++++++++++++++++++++++++++++-------------------------- sources | 2 +- 3 files changed, 39 insertions(+), 37 deletions(-) diff --git a/.cvsignore b/.cvsignore index 1dab975..be1e379 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ arj-3.10.22.tar.gz -arj_3.10.22-2.diff.gz +arj_3.10.22-6.diff.gz diff --git a/arj.spec b/arj.spec index f0b0aab..ec9b8a9 100644 --- a/arj.spec +++ b/arj.spec @@ -1,74 +1,76 @@ -Name: arj -Version: 3.10.22 -Release: 5%{?dist} -Summary: Archiver for .arj files -Group: Applications/Archiving -License: GPL+ -URL: http://arj.sourceforge.net/ -Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -# unarj.* from Debian. -Source1: unarj.sh -Source2: unarj.1 -Patch0: http://ftp.debian.org/debian/pool/main/a/%{name}/%{name}_%{version}-2.diff.gz -Patch1: arj-3.10.22-missing-protos.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: autoconf -Provides: unarj = %{version}-%{release} -Obsoletes: unarj < 3 +Summary: Archiver for .arj files +Name: arj +Version: 3.10.22 +Release: 6%{?dist} +License: GPL+ +Group: Applications/Archiving +URL: http://arj.sourceforge.net/ +Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz +# unarj.* from Debian +Source1: unarj.sh +Source2: unarj.1 +Patch0: http://ftp.debian.org/debian/pool/main/a/%{name}/%{name}_%{version}-6.diff.gz +Patch1: arj-3.10.22-missing-protos.patch +BuildRequires: autoconf +Provides: unarj = %{version}-%{release} +Obsoletes: unarj < 3 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description -This package is an open source version of the arj archiver. This -version has been created with the intent to preserve maximum -compatibility and retain the feature set of original ARJ archiver as -provided by ARJ Software, Inc. - +This package is an open source version of the arj archiver. It has +been created with the intent to preserve maximum compatibility and +retain the feature set of original ARJ archiver as provided by ARJ +Software, Inc. %prep %setup -q %patch0 -p1 +%patch1 -p1 + for i in debian/patches/00*.patch; do patch -p1 < $i done -%patch1 -p1 + pushd gnu autoconf popd - %build pushd gnu %configure popd -# no %{?_smp_mflags}, arj is not parallel build clean, no stripping please -make ADD_LDFLAGS="" +# Disable binary strippings +make %{?_smp_mflags} ADD_LDFLAGS="" %install rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT -# rm the register remainders of arj's sharewares time -rm $RPM_BUILD_ROOT%{_bindir}/arj-register -rm $RPM_BUILD_ROOT%{_mandir}/man1/arj-register.1* -install -Dpm 644 resource/rearj.cfg.example \ - $RPM_BUILD_ROOT%{_sysconfdir}/rearj.cfg +make DESTDIR=$RPM_BUILD_ROOT install + +install -Dpm 644 resource/rearj.cfg.example $RPM_BUILD_ROOT%{_sysconfdir}/rearj.cfg install -pm 755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/unarj install -pm 644 %{SOURCE2} $RPM_BUILD_ROOT%{_mandir}/man1/unarj.1 +# remove the register remainders of arj's sharewares time +rm -f $RPM_BUILD_ROOT%{_bindir}/arj-register +rm -f $RPM_BUILD_ROOT%{_mandir}/man1/arj-register.1* %clean rm -rf $RPM_BUILD_ROOT - %files -%defattr(-,root,root,-) +%defattr(-,root,root) %doc ChangeLog* doc/COPYING doc/rev_hist.txt %config(noreplace) %{_sysconfdir}/rearj.cfg %{_bindir}/*arj* %{_libdir}/arj/ %{_mandir}/man1/*arj*1.* - %changelog +* Mon Sep 08 2008 Robert Scheck 3.10.22-6 +- Added patch to refer to original author in the manual page +- Added patch to support parallel builds in upstream Makefile + * Sat Aug 30 2008 Robert Scheck 3.10.22-5 - Corrected from %%patch to %%patch0 to make rpm > 4.4 happy diff --git a/sources b/sources index c08f5a4..fe07d0b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ f263bf3cf6d42a8b7e85b4fb514336d3 arj-3.10.22.tar.gz -48d2275b8a8e6e5adaead8916d008fd3 arj_3.10.22-2.diff.gz +a34dbdd46d09248b4fd03d7d4faf3e30 arj_3.10.22-6.diff.gz From f72d4dc38fb9e651fc56d7f7c17613baba89584b Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:29:10 +0000 Subject: [PATCH 5/6] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index f0c5a63..44135a8 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: arj -# $Id$ +# $Id: Makefile,v 1.1 2006/09/10 05:10:29 jwrdegoede Exp $ NAME := arj 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 $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +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)) From 0df3904555d380820f38ed04501abfd0e89da048 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 10:10:57 +0000 Subject: [PATCH 6/6] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch 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 44135a8..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: arj -# $Id: Makefile,v 1.1 2006/09/10 05:10:29 jwrdegoede Exp $ -NAME := arj -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/branch b/branch deleted file mode 100644 index 42f697a..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -EL-5