- new way to update Version: field in spec

- new target for make 'make rpm'


git-svn-id: http://svn.irssi.org/repos/irssi/trunk@9 dbcabf3a-b0e7-0310-adc4-f8d773084564

3 files changed, 125 insertions, 71 deletions

diff --git a/Makefile.am b/Makefile.am
index 176258b8..781a735e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -39,8 +39,12 @@ EXTRA_DIST = window-views-patch.diff \
 	README-HEBREW \
 	COMMANDS \
 	file2header.sh \
-	irssi.spec.in \
 	irssi.spec \
 	$(conf_DATA) \
 	irssi.gnorba \
 	irssi.desktop
+
+## make rpms
+rpm: Makefile
+	$(MAKE) dist
+	rpm -ta --clean $(PACKAGE)-$(VERSION).tar.gz
diff --git a/configure.in b/configure.in
index a0af0232..4e660c1e 100644
--- a/configure.in
+++ b/configure.in
@@ -354,7 +354,8 @@ plugins/sound/Makefile
 plugins/proxy/Makefile
 plugins/external/Makefile
 plugins/bot/Makefile
-stamp.h)
+stamp.h
+irssi.spec)
 
 dnl **
 dnl ** internationalization support
diff --git a/irssi.spec.in b/irssi.spec.in
index 9f561d96..25f81705 100644
--- a/irssi.spec.in
+++ b/irssi.spec.in
@@ -1,87 +1,136 @@
-Name: irssi
-Version:
-Release: 1
-Packager: Red Hat Contrib|Net <rhcn-bugs@redhat.com>
-Vendor: Timo Sirainen <cras@irccrew.org>
-Distribution: Red Hat Contrib|Net
-Summary:  Irssi is a GTK based IRC client
-Copyright: GPL
-Group: X11/Applications/Networking
-URL: http://xlife.dhs.org/irssi/
-Source: http://xlife.dhs.org/irssi/files/%{name}-%{version}.tar.bz2
-Requires: gtk+
-Prefix: /usr
-BuildRoot: /tmp/%{name}-%{version}
-
-%changelog
-* Sun Aug 29 1999 JT Traub <jtraub@dragoncat.net>
-- Updated to 0.7.15 sources
-- Fixed config stuff that changed since last version.
-
-* Thu Mar 25 1999 JT Traub <jtraub@dragoncat.net>
-- Updated sources
-
-* Sat Mar 13 1999 JT Traub <jtraub@dragoncat.net>
-- Updated to 0.7.4 sources
-- Added the irssi-text bin to the package.
-
-* Mon Feb 22 1999 JT Traub <jtraub@dragoncat.net>
-- Made spec file compliant with RHCN guidelines.
-
-* Sun Feb 13 1999 JT Traub <jtraub@dragoncat.net>
-- Updated to 0.6.0 sources.
-- Cleaned up spec file to make it relocatable on install
-
-* Sun Feb 7 1999  JT Traub <jtraub@dragoncat.net>
-- Updated sources to 0.5.0
-- removed obsolete patch lines
-
-* Sat Feb 3 1999  JT Traub <jtraub@dragoncat.net>
-- Updated sources to 0.4.0
-- Deleted old patch line
-
-* Sat Jan 30 1999  JT Traub <jtraub@dragoncat.net>
-- Updated sources to 0.3.6
-- Updated spec to install the .desktop file.
-- Removed the now obsolete patch lines
-
-* Wed Jan 27 1999  JT Traub <jtraub@dragoncat.net>
-- Upgraded to 0.3.5
-
-* Sun Jan 24 1999  JT Traub <jtraub@dragoncat.net>
-- First attempt at building this
+# $Revision: 1.2 $, $Date: 1999/09/04 11:42:33 $
+Name: 		irssi
+Version: 	@VERSION@
+Release: 	1
+Vendor: 	Timo Sirainen <cras@irccrew.org>
+Summary:  	Irssi is a IRC client
+Copyright: 	GPL
+Group: 		Applications/Communications
+Group(pl):      Aplikacje/Komunikacja
+URL: 		http://xlife.dhs.org/irssi/
+Source0: 	http://xlife.dhs.org/irssi/files/%{name}-%{version}.tar.gz
+BuildRequires:	libPropList-devel
+BuildRequires:	glib-devel
+BuildRequires:	ncurses-devel
+BuildRequires:	imlib-devel
+BuildRequires:	gtk+-devel
+BuildRequires:	gnome-libs-devel
+BuildRequires:	XFree86-devel
+BuildRoot: 	/tmp/%{name}-%{version}-root
+
+%define		_sysconfdir	/etc
+%define		configure { CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \
+ CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
+ FFLAGS="${FFLAGS:-%optflags}" ; export FFLAGS ; \
+ ./configure %{_target_platform} \
+	--prefix=%{_prefix} \
+	--exec-prefix=%{_exec_prefix} \
+	--bindir=%{_bindir} \
+	--sbindir=%{_sbindir} \
+	--sysconfdir=%{_sysconfdir} \
+	--datadir=%{_datadir} \
+	--includedir=%{_includedir} \
+	--libdir=%{_libdir} \
+	--libexecdir=%{_libexecdir} \
+	--localstatedir=%{_localstatedir} \
+	--sharedstatedir=%{_sharedstatedir} \
+	--mandir=%{_mandir} \
+	--infodir=%{_infodir} }
 
 %description
-Irssi is a GTK based GUI IRC client by Timo Sirainen <cras@irccrew.org>.
+Irssi is a textUI IRC client with IPv6 support 
+by Timo Sirainen <cras@irccrew.org>.
 More information can be found at http://xlife.dhs.org/irssi/.
 
+%package GNOME
+Summary: 	GNOME version of irssi IRC client
+Group:		X11/Applications/Communications
+Group(pl):	X11/Aplikacje/Komunikacja
+Requires:	%{name} = %{version}
+
+%description GNOME
+Irssi is a GTK based (with GNOME) GUI IRC client with IPv6 support
+by Timo Sirainen <cras@irccrew.org>.
+More information can be found at http://xlife.dhs.org/irssi/.
 
 %prep
-%setup
+%setup -q
 
 %build
-./configure --prefix=%{prefix}
+automake
+CPPFLAGS="-I/usr/X11R6/include"; export CPPFLAGS
+LDFLAGS="-s -L/usr/X11R6/lib"; export LDFLAGS
+%configure \
+	--with-gnome \
+	--with-gnome-panel \
+	--with-imlib \
+	--enable-ipv6 \
+	--with-textui=ncurses \
+	--with-proplist \
+	--without-socks \
+	--with-plugins
 make
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make prefix=$RPM_BUILD_ROOT%{prefix} install
-strip $RPM_BUILD_ROOT%{prefix}/bin/irssi
-strip $RPM_BUILD_ROOT%{prefix}/bin/irssi-text
-strip $RPM_BUILD_ROOT%{prefix}/bin/irssi-bot
+make DESTDIR=$RPM_BUILD_ROOT install
+strip --strip-unneeded $RPM_BUILD_ROOT%{_libdir}/irssi/plugins/lib*.so.*.*
 
+gzip -9fn AUTHORS ChangeLog README TODO NEWS
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files 
-%defattr (-,root,root)
-%doc AUTHORS COPYING INSTALL ChangeLog README TODO NEWS
-%attr(755,root,root) %{prefix}/bin/irssi
-%attr(755,root,root) %{prefix}/bin/irssi-text
-%attr(755,root,root) %{prefix}/bin/irssi-bot
-%attr(644,root,root) %config %{prefix}/etc/irssi/*
-%attr(644,root,root) %{prefix}/etc/CORBA/servers/irssi.gnorba
-%attr(644,root,root) %{prefix}/share/applets/Network/irssi.desktop
-%attr(644,root,root) %{prefix}/share/gnome/help/irssi/C/*
-%attr(644,root,root) %{prefix}/lib/irssi/plugins/*
+%defattr (644,root,root,755)
+%doc {AUTHORS,ChangeLog,README,TODO,NEWS}.gz
+
+%attr(755,root,root) %{_bindir}/irssi-text
+%attr(755,root,root) %{_bindir}/irssi-bot
+
+%dir %{_sysconfdir}/irssi
+%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/irssi/*
+
+%dir %{_libdir}/irssi
+%dir %{_libdir}/irssi/plugins
+%attr(755,root,root) %{_libdir}/irssi/plugins/lib*.so.*.*
+%attr(755,root,root) %{_libdir}/irssi/plugins/lib*.so
+#%attr(755,root,root) %{_libdir}/irssi/plugins/lib*.la
+#%attr(755,root,root) %{_libdir}/irssi/plugins/lib*.a
+
+%files GNOME
+%defattr (644,root,root,755)
+%attr(755,root,root) %{_bindir}/irssi
+
+%{_sysconfdir}/CORBA/servers/irssi.gnorba
+%{_datadir}/applets/Network/irssi.desktop
+%{_datadir}/gnome/help/irssi
+
+%define date    %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
+%changelog
+* %{date} PLD Team <pld-list@pld.org.pl>
+All below listed persons can be reached on <cvs_login>@pld.org.pl
+
+$Log: irssi.spec.in,v $
+Revision 1.2  1999/09/04 11:42:33  wiget
+- new way to update Version: field in spec
+- new target for make 'make rpm'
+
+Revision 1.4  1999/09/03 09:36:24  wiget
+- updated to 0.7.16alpha-1
+
+Revision 1.3  1999/09/02 17:27:36  wiget
+- added BuildRequires rules
+
+Revision 1.2  1999/09/02 17:22:51  wiget
+- rewrite to PLD style coding:
+-- correct Group and Group(pl)
+-- %%changelog moved to end
+-- splited to irssi and irssi-GNOME
+-- added patch to allow 'make install DESTDIR=/some/dir'
+-- added ./configure parameters
+-- striped unneeded symbol from plugins
+-- gziped docs
+-- corrected %%files section
+
+- based at spec from tarball (by JT Traub <jtraub@dragoncat.net>)