[svn] r6257 - in trunk/rpms: irssi ne

[packagers at lists.rpmforge.net]

Author: dag
Date: 2008-04-10 00:49:23 +0100 (Thu, 10 Apr 2008)
New Revision: 6257

Modified:
   trunk/rpms/irssi/irssi.spec
   trunk/rpms/ne/ne.spec
Log:
Updates

Modified: trunk/rpms/irssi/irssi.spec
===================================================================
--- trunk/rpms/irssi/irssi.spec	2008-04-09 17:04:48 UTC (rev 6256)
+++ trunk/rpms/irssi/irssi.spec	2008-04-09 23:49:23 UTC (rev 6257)
@@ -7,12 +7,10 @@
 %define perl_vendorarch %(eval "`perl -V:installvendorarch`"; echo $installvendorarch)
 %define perl_vendorlib %(eval "`perl -V:installvendorlib`"; echo $installvendorlib)
 
-%define real_version 0.8.10
-
 Summary: Modular text-mode IRC client
 Name: irssi
-Version: 0.8.10a
-Release: 4
+Version: 0.8.12
+Release: 1
 License: GPL
 Group: Applications/Communications
 URL: http://irssi.org/
@@ -21,8 +19,13 @@
 Patch0: irssi-0.8.10-dcc-unregister.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
-BuildRequires: autoconf, automake, gcc-c++,
-BuildRequires: glib2-devel, imlib-devel, ncurses-devel
+BuildRequires: gcc-c++,
+BuildRequires: glib2-devel
+BuildRequires: imlib-devel
+BuildRequires: ncurses-devel
+BuildRequires: openssl-devel
+BuildRequires: perl(ExtUtils::Embed)
+BuildRequires: zlib-devel
 %{?_with_gc:BuildRequires: libgc-devel}
 
 Provides: irssi-devel = %{version}-%{release}
@@ -36,39 +39,40 @@
 Support for other protocols like ICQ could be created some day too.
 
 %prep
-%setup -n %{name}-%{real_version}
-%patch0 -p0
+%setup
+#patch0 -p0
 %{?el3:%{__perl} -pi.orig -e 's|^CFLAGS = |CFLAGS = -I/usr/kerberos/include |' src/core/Makefile.in}
 %{?rh9:%{__perl} -pi.orig -e 's|^CFLAGS = |CFLAGS = -I/usr/kerberos/include |' src/core/Makefile.in}
 
 %build
 %configure \
-        --enable-ipv6 \
-	--enable-ssl \
-        --with-bot \
+    --enable-ipv6 \
+    --enable-ssl \
+    --with-bot \
 %{?_with_gc:--with-gc} \
-	--with-glib2 \
-	--with-imlib \
-        --with-ncurses \
-	--with-perl-lib="%(dirname %{buildroot}%{perl_vendorarch})" \
-	--with-plugins \
-        --with-proxy \
-        --with-textui
-#	--with-perl="module" \
-#	--with-perl-lib="%{buildroot}%{perl_vendorarch}"
-#	--with-perl-lib="vendor"
+    --with-glib2 \
+    --with-imlib \
+    --with-ncurses \
+    --with-perl="yes" \
+    --with-perl-lib="vendor" \
+    --with-plugins \
+    --with-proxy \
+    --with-textui
+#    --with-perl-lib="%(dirname %{buildroot}%{perl_vendorarch})" \
+#    --with-perl="module" \
+#    --with-perl-lib="%{buildroot}%{perl_vendorarch}" \
 %{__make} %{?_smp_mflags}
 
 %install
 %{__rm} -rf %{buildroot}
-%makeinstall PREFIX="%{buildroot}%{_prefix}"
-#	PERL_USE_LIB="%{buildroot}%{perl_vendorarch}"
+%makeinstall PERL_INSTALL_ROOT="%{buildroot}" INSTALL="%{__install} -p"
+#makeinstall PREFIX="%{buildroot}%{_prefix}"
+#   PERL_USE_LIB="%{buildroot}%{perl_vendorarch}"
 
 ### Clean up buildroot
+find %{buildroot} -name .packlist -exec %{__rm} {} \;
 %{__rm} -f %{buildroot}%{_libdir}/irssi/modules/*.{a,la}
-%{__rm} -f %{buildroot}%{perl_vendorarch}/auto/Irssi/.packlist \
-		%{buildroot}%{perl_vendorarch}/auto/Irssi/*/.packlist \
-		%{buildroot}%{perl_vendorarch}/perllocal.pod
+%{__rm} -f %{buildroot}%{perl_vendorarch}/perllocal.pod
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -90,6 +94,9 @@
 %exclude %{_docdir}/irssi/
 
 %changelog
+* Wed Apr 09 2008 Dag Wieers <dag at wieers.com> - 0.8.12-1
+- Updated to release 0.8.12.
+
 * Thu Aug 02 2007 Dag Wieers <dag at wieers.com> - 0.8.10a-4
 - Disabled libgc for all distributions. (And be done with this mess)
 

Modified: trunk/rpms/ne/ne.spec
===================================================================
--- trunk/rpms/ne/ne.spec	2008-04-09 17:04:48 UTC (rev 6256)
+++ trunk/rpms/ne/ne.spec	2008-04-09 23:49:23 UTC (rev 6257)
@@ -4,8 +4,8 @@
 
 Summary: Nice editor
 Name: ne
-Version: 1.42
-Release: 1.2
+Version: 1.43
+Release: 1
 License: GPL
 Group: Applications/Editors
 URL: http://ne.dsi.unimi.it/
@@ -38,40 +38,37 @@
 %setup
 
 %build
-%{__make} %{?_smp_mflags} -C src \
-	CFLAGS="%{optflags}"
+%{__make} %{?_smp_mflags} -C src CFLAGS="%{optflags}"
 
 %install
 %{__rm} -rf %{buildroot}
 %{__install} -Dp -m0755 src/ne %{buildroot}%{_bindir}/ne
 %{__install} -Dp -m0644 doc/ne.1 %{buildroot}%{_mandir}/man1/ne.1
+%{__install} -Dp -m0644 doc/ne.info.gz %{buildroot}%{_infodir}/ne.info.gz
 
-%{__install} -d -m0755 %{buildroot}%{_infodir}
-%{__install} -p -m0644 doc/ne.info* %{buildroot}%{_infodir}
-
 %post
-/sbin/install-info %{_infodir}/%{name}.info.gz %{_infodir}/dir
+/sbin/install-info %{_infodir}/ne.info.gz %{_infodir}/dir
 
 %preun
-/sbin/install-info --delete %{_infodir}/%{name}.info.gz %{_infodir}/dir
+/sbin/install-info --delete %{_infodir}/ne.info.gz %{_infodir}/dir
 
 %clean
 %{__rm} -rf %{buildroot}
 
 %files
 %defattr(-, root, root, 0755)
-%doc CHANGES COPYING doc/*.html doc/default.* doc/ne.txt README terms/
+%doc CHANGES COPYING README doc/default.* doc/ne.txt doc/ne/ terms/
 %doc %{_mandir}/man1/ne.1*
-%doc %{_infodir}/*.info*
+%doc %{_infodir}/ne.info*
 %{_bindir}/ne
 
 %files docs
 %defattr(-, root, root, 0755)
-%doc doc/*.html doc/*.pdf doc/*.ps doc/ne.txt
+%doc doc/ne/ doc/*.pdf doc/*.ps doc/ne.txt
 
 %changelog
-* Sat Apr 08 2006 Dries Verachtert <dries at ulyssis.org> - 1.42-1.2
-- Rebuild for Fedora Core 5.
+* Thu Apr 10 2008 Dag Wieers <dag at wieers.com> - 1.43-1
+- Updated to release 1.43.
 
 * Fri Jan 26 2006 Dag Wieers <dag at wieers.com> - 1.42-1
 - Updated to release 1.42.