rpms/nail/FC-5 .cvsignore, 1.2, 1.3 nail.spec, 1.13, 1.14 sources, 1.4, 1.5 nail-12.0-nostrip.patch, 1.1, NONE

[Dmitry Butskoy (buc)]

Author: buc

Update of /cvs/extras/rpms/nail/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31685

Modified Files:
	.cvsignore nail.spec sources 
Removed Files:
	nail-12.0-nostrip.patch 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nail/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Sep 2005 10:28:36 -0000	1.2
+++ .cvsignore	12 Jan 2007 13:59:19 -0000	1.3
@@ -1 +1 @@
-nail-11.25.tar.bz2
+mailx-12.2.tar.bz2


Index: nail.spec
===================================================================
RCS file: /cvs/extras/rpms/nail/FC-5/nail.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- nail.spec	16 Jun 2006 16:03:44 -0000	1.13
+++ nail.spec	12 Jan 2007 13:59:19 -0000	1.14
@@ -3,7 +3,7 @@
 
 Summary: Enhanced implementation of the mailx command
 Name: nail
-Version: 12.1
+Version: 12.2
 Release: 1%{?dist}
 Group: 	Applications/Internet
 License: BSD
@@ -11,12 +11,11 @@
 Source0: http://dl.sourceforge.net/heirloom/mailx-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0: nail-11.25-config.patch
-Patch1: nail-12.0-nostrip.patch
 
 %if %{use_nss}
-BuildRequires: mozilla-nss-devel, mozilla-nspr-devel, pkgconfig
+BuildRequires: nss-devel, pkgconfig
 %else
-BuildRequires: krb5-devel, openssl-devel
+BuildRequires: openssl-devel
 %endif
 
 
@@ -37,7 +36,6 @@
 %prep
 %setup -q -n mailx-%{version}
 %patch0 -p1
-%patch1 -p1
 
 %if %{rename}
 #  Use old name "nail" to avoid conflicts with the Core mailx package
@@ -60,11 +58,9 @@
 
 
 %build
-rm -rf $RPM_BUILD_ROOT
 
 %if %{use_nss}
-INCLUDES="$INCLUDES `pkg-config --cflags-only-I mozilla-nspr`"
-INCLUDES="$INCLUDES `pkg-config --cflags-only-I mozilla-nss`"
+INCLUDES="$INCLUDES `pkg-config --cflags-only-I nss`"
 export INCLUDES
 %endif
 
@@ -84,7 +80,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT `cat makeflags` install
+make DESTDIR=$RPM_BUILD_ROOT STRIP=: `cat makeflags` install
 
 %if %{rename}
 # rename to old name "nail", to avoid conflicts with the Core mailx package
@@ -106,6 +102,10 @@
 
 
 %changelog
+* Fri Jan 12 2007 Dmitry Butskoy <Dmitry at Butskoy.name> - 12.2-1
+- update to 12.2
+- spec file cleanups
+
 * Fri Jun 16 2006 Dmitry Butskoy <Dmitry at Butskoy.name> - 12.1-1
 - update to 12.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nail/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	16 Jun 2006 16:03:44 -0000	1.4
+++ sources	12 Jan 2007 13:59:19 -0000	1.5
@@ -1 +1 @@
-b78962f9384a9134adeb9ba1619aa6da  mailx-12.1.tar.bz2
+c13c24db8fb5f5d10b7ad148647f9909  mailx-12.2.tar.bz2


--- nail-12.0-nostrip.patch DELETED ---