rpms/rcs/devel rcs-5.7-build-tweaks.patch, NONE, 1.1 rcs-5.7-DESTDIR.patch, 1.1, 1.2 rcs.spec, 1.23, 1.24 rcs-5.7-stupidrcs.patch, 1.1, NONE
Jiří Moskovčák
jmoskovc at fedoraproject.org
Mon Jan 11 11:05:12 UTC 2010
Author: jmoskovc
Update of /cvs/extras/rpms/rcs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29076
Modified Files:
rcs-5.7-DESTDIR.patch rcs.spec
Added Files:
rcs-5.7-build-tweaks.patch
Removed Files:
rcs-5.7-stupidrcs.patch
Log Message:
Spec file fixes based on review
rcs-5.7-build-tweaks.patch:
configure.in | 2 +-
man/Makefile.in | 7 ++++---
src/Makefile.in | 6 ++++--
src/conf.sh | 12 ------------
4 files changed, 9 insertions(+), 18 deletions(-)
--- NEW FILE rcs-5.7-build-tweaks.patch ---
>From 2a814cf24019073a05f64c306a39b3202efe40ab Mon Sep 17 00:00:00 2001
From: Romain Francoise <rfrancoise at debian.org>
Date: Sun, 23 Mar 2008 00:57:09 +0100
Subject: [PATCH] Various build tweaks
Including:
- allow building as root
- install rcsfreeze and its man page
- pass CFLAGS properly
- install man pages in /usr/share/man
- tweak default PATH when looking for sendmail
---
configure.in | 2 +-
man/Makefile.in | 7 ++++---
src/Makefile.in | 6 ++++--
src/conf.sh | 11 -----------
4 files changed, 9 insertions(+), 17 deletions(-)
diff --git a/configure.in b/configure.in
index b6dd5d2..3c6aed3 100644
--- a/configure.in
+++ b/configure.in
@@ -243,7 +243,7 @@ rm -f conftest*
AC_PATH_PROG(ED, ed, ed)
ac_save_path=$PATH
-PATH=/usr/lib:/usr/bin:/bin:/usr/sbin:/sbin:$PATH
+PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/lib:$PATH
AC_PATH_PROGS(SENDMAIL, sendmail mail mailx)
PATH=$ac_save_path
case $SENDMAIL in
diff --git a/man/Makefile.in b/man/Makefile.in
index 8ff25df..ffc8c7c 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -34,8 +34,8 @@ INSTALL_DATA = @INSTALL_DATA@
PIC = @PIC@
prefix = @prefix@
-man1dir = $(prefix)/man/man1
-man5dir = $(prefix)/man/man5
+man1dir = $(prefix)/share/man/man1
+man5dir = $(prefix)/share/man/man5
man1ext = .1
man5ext = .5
@@ -51,7 +51,8 @@ check dvi info TAGS ::
installdirs :: ../mkinstalldirs
-$(srcdir)/../mkinstalldirs $(man1dir) $(man5dir)
-man1pages = ci co ident merge rcs rcsclean rcsdiff rcsintro rcsmerge rlog
+man1pages = ci co ident merge rcs rcsclean rcsdiff rcsintro rcsmerge rlog \
+ rcsfreeze
install :: installdirs
-for m in $(man1pages); do \
diff --git a/src/Makefile.in b/src/Makefile.in
index c27af21..5bc2147 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -116,16 +116,18 @@ install :: all installdirs
for p in $(PROGRAMS); do \
$(INSTALL_PROGRAM) $$p $(bindir)/$$p; \
done
+ $(INSTALL_PROGRAM) rcsfreeze.sh $(bindir)/rcsfreeze
uninstall ::
for p in $(PROGRAMS); do \
$(REMOVE) $(bindir)/$$p; \
done
+ $(REMOVE) $(bindir)/rcsfreeze
# Install RCS and (if applicable) GNU diff before running these tests.
# To test RCS before installing it, see the file INSTALL.RCS.
RCSTEST = \
- ALL_CFLAGS='$(ALL_CFLAGS)' CC='$(CC)' DIFF='$(DIFF)' \
+ ALL_CFLAGS="$(ALL_CFLAGS)" CC='$(CC)' DIFF='$(DIFF)' \
LDFLAGS='$(LDFLAGS)' LIBS='$(LIBS)' \
PATH=$(bindir):$$PATH \
sh $(srcdir)/rcstest
@@ -153,7 +155,7 @@ maintainer-clean :: distclean
#(Unix
conf.h : conf.sh Makefile
$(REMOVE) a.*
- ALL_CFLAGS='$(ALL_CFLAGS)' \
+ ALL_CFLAGS="$(ALL_CFLAGS)" \
CC='$(CC)' \
COMPAT2='$(COMPAT2)' \
DIFF3='$(DIFF3)' DIFF3_BIN='$(DIFF3_BIN)' \
diff --git a/src/conf.sh b/src/conf.sh
index c9bf0b3..b28a504 100644
--- a/src/conf.sh
+++ b/src/conf.sh
@@ -73,17 +73,6 @@ case `echo -n` in
ech='echo -n' dots='... '
esac
-$ech >&3 "$0: testing permissions $dots"
-rm -f a.d &&
-date >a.d &&
-chmod 0 a.d &&
-{ test -w a.d || cp /dev/null a.d 2>/dev/null; } && {
- echo >&3 "$n$0: This command should not be run with superuser permissions."
- exit 1
-}
-echo >&3 OK
-rm -f a.d || exit
-
$ech >&3 "$0: testing compiler for plausibility $dots"
echo 'main() { return 0; }' >a.c
rm -f a.exe a.out || exit
--
1.6.3.2.306.g4f4fa
rcs-5.7-DESTDIR.patch:
man/Makefile.in | 6 +++---
src/Makefile.in | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
Index: rcs-5.7-DESTDIR.patch
===================================================================
RCS file: /cvs/extras/rpms/rcs/devel/rcs-5.7-DESTDIR.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- rcs-5.7-DESTDIR.patch 3 Sep 2008 20:05:23 -0000 1.1
+++ rcs-5.7-DESTDIR.patch 11 Jan 2010 11:05:11 -0000 1.2
@@ -1,14 +1,15 @@
-diff -up rcs-5.7/man/Makefile.in.BAD rcs-5.7/man/Makefile.in
---- rcs-5.7/man/Makefile.in.BAD 2008-09-03 16:00:36.000000000 -0400
-+++ rcs-5.7/man/Makefile.in 2008-09-03 16:01:35.000000000 -0400
-@@ -49,16 +49,16 @@ rcsfile.5 : rcsfile.5in
+diff -up rcs-5.7/man/Makefile.in~ rcs-5.7/man/Makefile.in
+--- rcs-5.7/man/Makefile.in~ 2009-06-23 00:06:19.000000000 +0300
++++ rcs-5.7/man/Makefile.in 2009-06-23 00:08:06.000000000 +0300
+@@ -49,17 +49,17 @@ rcsfile.5 : rcsfile.5in
check dvi info TAGS ::
installdirs :: ../mkinstalldirs
- -$(srcdir)/../mkinstalldirs $(man1dir) $(man5dir)
+ -$(srcdir)/../mkinstalldirs $(DESTDIR)$(man1dir) $(DESTDIR)$(man5dir)
- man1pages = ci co ident merge rcs rcsclean rcsdiff rcsintro rcsmerge rlog
+ man1pages = ci co ident merge rcs rcsclean rcsdiff rcsintro rcsmerge rlog \
+ rcsfreeze
install :: installdirs
-for m in $(man1pages); do \
@@ -21,10 +22,10 @@ diff -up rcs-5.7/man/Makefile.in.BAD rcs
uninstall ::
for m in $(man1pages); do \
-diff -up rcs-5.7/src/Makefile.in.BAD rcs-5.7/src/Makefile.in
---- rcs-5.7/src/Makefile.in.BAD 2008-09-03 15:59:48.000000000 -0400
-+++ rcs-5.7/src/Makefile.in 2008-09-03 16:00:26.000000000 -0400
-@@ -110,11 +110,11 @@ all :: $(PROGRAMS)
+diff -up rcs-5.7/src/Makefile.in~ rcs-5.7/src/Makefile.in
+--- rcs-5.7/src/Makefile.in~ 2009-06-23 00:06:19.000000000 +0300
++++ rcs-5.7/src/Makefile.in 2009-06-23 00:07:29.000000000 +0300
+@@ -110,13 +110,13 @@ all :: $(PROGRAMS)
$(CC) -c $(ALL_CFLAGS) $<
installdirs :: ../mkinstalldirs
@@ -36,5 +37,8 @@ diff -up rcs-5.7/src/Makefile.in.BAD rcs
- $(INSTALL_PROGRAM) $$p $(bindir)/$$p; \
+ $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$p; \
done
+- $(INSTALL_PROGRAM) rcsfreeze.sh $(bindir)/rcsfreeze
++ $(INSTALL_PROGRAM) rcsfreeze.sh $(DESTDIR)$(bindir)/rcsfreeze
uninstall ::
+ for p in $(PROGRAMS); do \
Index: rcs.spec
===================================================================
RCS file: /cvs/extras/rpms/rcs/devel/rcs.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- rcs.spec 27 Jul 2009 02:50:56 -0000 1.23
+++ rcs.spec 11 Jan 2010 11:05:12 -0000 1.24
@@ -1,19 +1,24 @@
Summary: Revision Control System (RCS) file version management tools
Name: rcs
Version: 5.7
-Release: 35%{?dist}
+Release: 36%{?dist}
License: GPLv2+
Group: Development/Tools
URL: http://www.gnu.org/software/rcs/
Source: ftp://ftp.gnu.org/gnu/rcs/%{name}-%{version}.tar.gz
-Patch0: rcs-5.7-stupidrcs.patch
+Patch0: rcs-5.7-build-tweaks.patch
Patch1: rcs-5.7-security.patch
Patch2: rcs-5.7-sameuserlocks.patch
Patch3: rcs-5.7-option.patch
Patch4: rcs-5.7-newsvnsyntax.patch
Patch5: rcs-5.7-DESTDIR.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: automake
+BuildRequires: autoconf
+BuildRequires: groff
+BuildRequires: ghostscript
+BuildRequires: sendmail
+BuildRequires: ed
+Requires: diffutils
%description
The Revision Control System (RCS) is a system for managing multiple
@@ -27,7 +32,7 @@ different versions of files.
%prep
%setup -q
-%patch0 -p1 -b .stupidrcs
+%patch0 -p1 -b .debiantweaks
%patch1 -p1 -b .security
%patch2 -p1 -b .sameuserlocks
%patch3 -p1 -b .option
@@ -37,23 +42,42 @@ autoconf
%build
%configure --with-diffutils
-touch src/conf.h
make %{?_smp_mflags}
+for f in rcs rcs_func ; do
+ groff -p -Tps -ms $f.ms | ps2pdf - $f.pdf
+done
%install
rm -rf ${RPM_BUILD_ROOT}
-make DESTDIR=${RPM_BUILD_ROOT} man1dir=%{_mandir}/man1 man5dir=%{_mandir}/man5 install
+make DESTDIR=${RPM_BUILD_ROOT} install
+
+%check
+# hack: make path to "co" relative in order to test the built one; the real
+# executables were already installed out of the way in %%install
+sed -i -e 's|"%{_bindir}/co"|"co"|' src/conf.h ; make %{?_smp_mflags} -C src
+PATH="`pwd`/src:${PATH}" make installdebug
+# ...and hack it back for sources in -debuginfo
+sed -i -e 's|"co"|"%{_bindir}/co"|' src/conf.h
+
+%clean
+rm -rf ${RPM_BUILD_ROOT}
%files
%defattr(-,root,root,-)
-%doc ChangeLog CREDITS NEWS rcs_func.ms rcs.ms README REFS
+%doc ChangeLog COPYING CREDITS NEWS rcs_func.pdf rcs.pdf README REFS
%{_bindir}/*
%{_mandir}/man[15]/*
-%clean
-rm -rf ${RPM_BUILD_ROOT}
-
%changelog
+* Tue Jan 11 2010 Ville Skyttä <ville.skytta at iki.fi> - 5.7-36
+- Add dependency on diffutils.
+- Apply build tweaks patch from Debian (incl installing rcsfreeze).
+- BuildRequire autoconf instead of automake.
+- Actually configure instead of shipping a pregenerated conf.h (#226356).
+- Ship docs as PDF rather than troff source.
+- Run test suite during build.
+- Include COPYING.
+
* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.7-35
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
--- rcs-5.7-stupidrcs.patch DELETED ---
More information about the scm-commits
mailing list