RPM builder patch

This is a multi-part message in MIME format.
--------------040605090403000502010308
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hi,

I've attached a patch against today's trunk to repair 'make rpm'
functionality in irssi. A few bugs are fixed:

* 'rpm -ta' is deprecated and broken in recent releases. Change to use
rpmbuild instead.

* The "includes" directory gets installed but not packaged, causing
rpmbuild to fail. Add this to the package list.

* RPM does not allow the dash symbol in version numbers, creating an
obvious problem for 0.8.11-rc1. Fixed with a post-dist script to switch
the dash for an underscore.

Tested on CentOS 4 and CentOS 5 beta, all working well. Now I don't have
to hash up my system to get irssi installed. :)

- --
Jay L. T. Cornwall, http://www.esuna.co.uk/~jay/
PhD Student
Imperial College London
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (MingW32)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFGEFJloHnC75cy2zgRAjSYAKCAGEocBcGeugCml7QGH6WI5uP9oACeNQ0k
ZiAVdAQjnjtjuVoeUdCOeEE=
=i8Le
-----END PGP SIGNATURE-----

--------------040605090403000502010308
Content-Type: text/plain;
 name="irssi-20070402-rpmbuild.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="irssi-20070402-rpmbuild.patch"

Index: irssi.spec.in
===================================================================
--- irssi.spec.in	(revision 4433)
+++ irssi.spec.in	(working copy)
@@ -41,7 +41,7 @@
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
-make DESTDIR=${RPM_BUILD_ROOT} PREFIX=${RPM_BUILD_ROOT}%{_prefix} PERL_INSTALL_ROOT=${RPM_BUILD_ROOT} install
+make DESTDIR=${RPM_BUILD_ROOT} install
 strip ${RPM_BUILD_ROOT}%{_bindir}/*
 strip ${RPM_BUILD_ROOT}%{_libdir}/irssi/modules/lib*.so*
 
@@ -65,8 +65,12 @@
 %{_libdir}/irssi/
 %{perl_archlib}
 %{_datadir}/irssi/
+%{_includedir}/irssi/
 
 %changelog
+* Mon Apr 02 2007 Jay L. T. Cornwall <[email protected]>
+  Fixed broken Perl module installation. Added include files to list.
+
 * Mon Nov 17 2003 Robert Scheck <[email protected]>
   Fixed many things for better rebuilding and a good package
 
Index: Makefile.am
===================================================================
--- Makefile.am	(revision 4433)
+++ Makefile.am	(working copy)
@@ -41,4 +41,20 @@
 ## make rpms
 rpm: Makefile
 	$(MAKE) dist
-	rpm -ta --clean $(PACKAGE)-$(VERSION).tar.gz
+
+	rpmversion=`echo $(VERSION) | sed 's/\(.*\)-\(.*\)/\1_\2/'`          && \
+	if test "$(VERSION)" != "$$rpmversion"; then                            \
+		tar zxf $(PACKAGE)-$(VERSION).tar.gz                               && \
+		rpmdir="$(PACKAGE)-$$rpmversion"                                   && \
+		mv $(PACKAGE)-$(VERSION) $$rpmdir                                  && \
+		sed "s/$(VERSION)/$$rpmversion/" $$rpmdir/irssi.spec > irssi.spec  && \
+		rm -f $$rpmdir/irssi.spec                                          && \
+		mv irssi.spec $$rpmdir/                                            && \
+		rpmtar="$$rpmdir.tar.gz"                                           && \
+		tar zcf $$rpmtar $$rpmdir                                          && \
+		rm -fr $$rpmdir                                                    && \
+		rpmbuild -ta --clean $$rpmtar                                      && \
+		rm -f $$rpmtar;                                                       \
+	else                                                                    \
+		rpmbuild -ta --clean $(PACKAGE)-$(VERSION).tar.gz;                    \
+	fi

--------------040605090403000502010308
Content-Type: application/octet-stream;
 name="irssi-20070402-rpmbuild.patch.sig"
Content-Transfer-Encoding: base64
Content-Disposition: attachment;
 filename="irssi-20070402-rpmbuild.patch.sig"

iD8DBQBGEFJloHnC75cy2zgRAjN4AJsEXi706S2ydF0kagjq+YyqAg30gwCfYmwBb3VKiU2L
fEvQMopHAQMKYNU=
--------------040605090403000502010308--