dist-git conversion

#2781)

.cvsignore

@@ -1,2 +0,0 @@
-arj-3.10.22.tar.gz
-arj_3.10.22-2.diff.gz

.gitignore

@@ -0,0 +1,2 @@
+arj-3.10.22.tar.gz
+arj_3.10.22-6.diff.gz

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: arj
-# $Id$
-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
-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)

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 <conio.h>
+ #include <io.h>
+ #include <process.h>
++#else
++#include <sys/wait.h>
+ #endif
+ 
+ #include <fcntl.h>
+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 <stdio.h>
+ #include <signal.h>
+ 
+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 <stdio.h>
+ #include <signal.h>
+ 

arj.spec

@@ -1,72 +1,85 @@
-Name:           arj
-Version:        3.10.22
-Release:        1%{?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
-# unarj.* from Debian.
-Source1:        unarj.sh
-Source2:        unarj.1
-Patch0:         http://ftp.debian.org/debian/pool/main/a/%{name}/%{name}_%{version}-2.diff.gz
-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
-%patch -p1
+%patch0 -p1
+%patch1 -p1
+
 for i in debian/patches/00*.patch; do
   patch -p1 < $i
 done
+
 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 <robert@fedoraproject.org> 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 <robert@fedoraproject.org> 3.10.22-5
+- Corrected from %%patch to %%patch0 to make rpm > 4.4 happy
+
+* Mon Mar 31 2008 Hans de Goede <j.w.r.degoede@hhs.nl> 3.10.22-4
+- Fix missing prototype compiler warnings
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 3.10.22-3
+- Autorebuild for GCC 4.3
+
 * Fri Aug  3 2007 Hans de Goede <j.w.r.degoede@hhs.nl> 3.10.22-2
 - Update License tag for new Licensing Guidelines compliance
 

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