Re: [gnet-dev] RPM patch
- From: Ross Golder <ross golder org>
- To: gnet-dev gnetlibrary org
- Subject: Re: [gnet-dev] RPM patch
- Date: 24 Oct 2001 22:13:24 +0100
On Wed, 2001-10-24 at 22:07, Ross Golder wrote:
> Here's a patch for fixing up the 'make rpm' rule, so you don't need to
> be root. It should be perfectly backward compatible.
>
> Please let me know if it is OK to commit this.
>
It works, but I had to also add 'debian' to Makefile.am EXTRA_DIST,
otherwise the ./configure would fail.
-- output from 'rpm -ta gnet-1.1.1.tar.gz
Wrote: /data/home/rossg/redhat/SRPMS/gnet-1.1.1-1.src.rpm
Wrote: /data/home/rossg/redhat/RPMS/i386/gnet-1.1.1-1.i386.rpm
Wrote: /data/home/rossg/redhat/RPMS/i386/gnet-devel-1.1.1-1.i386.rpm
Executing(%clean): /bin/sh -e /var/tmp/rpm-tmp.40131
+ umask 022
+ cd /data/home/rossg/redhat/BUILD
+ cd gnet-1.1.1
+ rm -rf /var/tmp/gnet-1.1.1-root
+ exit 0
--
Ross
> --
> Ross
>
>
> ----
>
> ? patch
> ? rpm.patch
> ? debian/Makefile.am
> Index: ChangeLog
> ===================================================================
> RCS file: /cvs/gnome/gnet/ChangeLog,v
> retrieving revision 1.118
> diff -u -r1.118 ChangeLog
> --- ChangeLog 2001/10/24 19:58:29 1.118
> +++ ChangeLog 2001/10/24 21:04:18
> @@ -1,3 +1,7 @@
> +Wed Oct 24 10:02:43 2001 Ross Golder <ross golder org>
> +
> + * Makefile.am: Updated handling of rpms and spec files
> +
> Wed Oct 24 15:58:14 2001 David Helder <dhelder umich edu>
>
> * tests/unpack.c (main): Fix bugs
> Index: Makefile.am
> ===================================================================
> RCS file: /cvs/gnome/gnet/Makefile.am,v
> retrieving revision 1.12
> diff -u -r1.12 Makefile.am
> --- Makefile.am 2001/09/20 16:41:10 1.12
> +++ Makefile.am 2001/10/24 21:04:18
> @@ -5,7 +5,8 @@
> @SET_MAKE@
>
> EXTRA_DIST=TODO HACKING BUGS README.macosx gnetconfig.h.in \
> - README.win32 GNET.DSP config.h.win32 gnet.def gnet.m4
> + README.win32 GNET.DSP config.h.win32 gnet.def gnet.m4 \
> + gnet.spec
>
> bin_SCRIPTS=gnet-config
> BUILT_SOURCES=gnet-config
> @@ -28,9 +29,10 @@
> DEBFILEDEV=libgnet$(GNET_MAJOR_VERSION).$(GNET_MINOR_VERSION)-dev_$(VERSION)-*_i386.deb
> DEBSRC=gnet_$(VERSION)-1.tar.gz
>
> -RPMFILE=/usr/src/redhat/RPMS/i386/gnet-$(VERSION)-*.i386.rpm
> -RPMFILEDEV=/usr/src/redhat/RPMS/i386/gnet-devel-$(VERSION)-*.i386.rpm
> -RPMFILESRC=/usr/src/redhat/SRPMS/gnet-$(VERSION)-*.src.rpm
> +RPMROOT=/usr/src/redhat
> +RPMFILE=$(RPMROOT)/RPMS/i386/gnet-$(VERSION)-*.i386.rpm
> +RPMFILEDEV=$(RPMROOT)/RPMS/i386/gnet-devel-$(VERSION)-*.i386.rpm
> +RPMFILESRC=$(RPMROOT)/SRPMS/gnet-$(VERSION)-*.src.rpm
>
>
> snapshot:
> @@ -63,10 +65,10 @@
> lintian debian-temp/$(DEBFILEDEV)
>
> rpm:
> - echo Make sure you are root!
> - cp $(TARBALL) /usr/src/redhat/SOURCES
> - rpm -ba gnet.spec
> + echo You don\'t need to be root, but make sure you
> + echo do \'make RPMROOT=/home/someone/redhat rpm\' if
> + echo you do not use $(RPMROOT).
> + rpm -ta $(TARBALL)
>
> clean-local:
> rm -rf debian-temp
> -
? patch
? rpm.patch
? debian/Makefile.am
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gnet/ChangeLog,v
retrieving revision 1.118
diff -u -r1.118 ChangeLog
--- ChangeLog 2001/10/24 19:58:29 1.118
+++ ChangeLog 2001/10/24 21:04:18
@@ -1,3 +1,7 @@
+Wed Oct 24 10:02:43 2001 Ross Golder <ross golder org>
+
+ * Makefile.am: Updated handling of rpms and spec files
+
Wed Oct 24 15:58:14 2001 David Helder <dhelder umich edu>
* tests/unpack.c (main): Fix bugs
Index: Makefile.am
===================================================================
RCS file: /cvs/gnome/gnet/Makefile.am,v
retrieving revision 1.12
diff -u -r1.12 Makefile.am
--- Makefile.am 2001/09/20 16:41:10 1.12
+++ Makefile.am 2001/10/24 21:04:18
@@ -5,7 +5,8 @@
@SET_MAKE@
EXTRA_DIST=TODO HACKING BUGS README.macosx gnetconfig.h.in \
- README.win32 GNET.DSP config.h.win32 gnet.def gnet.m4
+ README.win32 GNET.DSP config.h.win32 gnet.def gnet.m4 \
+ gnet.spec
bin_SCRIPTS=gnet-config
BUILT_SOURCES=gnet-config
@@ -28,9 +29,10 @@
DEBFILEDEV=libgnet$(GNET_MAJOR_VERSION).$(GNET_MINOR_VERSION)-dev_$(VERSION)-*_i386.deb
DEBSRC=gnet_$(VERSION)-1.tar.gz
-RPMFILE=/usr/src/redhat/RPMS/i386/gnet-$(VERSION)-*.i386.rpm
-RPMFILEDEV=/usr/src/redhat/RPMS/i386/gnet-devel-$(VERSION)-*.i386.rpm
-RPMFILESRC=/usr/src/redhat/SRPMS/gnet-$(VERSION)-*.src.rpm
+RPMROOT=/usr/src/redhat
+RPMFILE=$(RPMROOT)/RPMS/i386/gnet-$(VERSION)-*.i386.rpm
+RPMFILEDEV=$(RPMROOT)/RPMS/i386/gnet-devel-$(VERSION)-*.i386.rpm
+RPMFILESRC=$(RPMROOT)/SRPMS/gnet-$(VERSION)-*.src.rpm
snapshot:
@@ -63,10 +65,10 @@
lintian debian-temp/$(DEBFILEDEV)
rpm:
- echo Make sure you are root!
- cp $(TARBALL) /usr/src/redhat/SOURCES
- rpm -ba gnet.spec
+ echo You don\'t need to be root, but make sure you
+ echo do \'make RPMROOT=/home/someone/redhat rpm\' if
+ echo you do not use $(RPMROOT).
+ rpm -ta $(TARBALL)
clean-local:
rm -rf debian-temp
-
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]