rpms/nail/FC-6 nail.spec, 1.14, 1.15 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-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2525

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



Index: nail.spec
===================================================================
RCS file: /cvs/extras/rpms/nail/FC-6/nail.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- nail.spec	1 Sep 2006 14:54:31 -0000	1.14
+++ nail.spec	12 Jan 2007 14:01:14 -0000	1.15
@@ -3,20 +3,19 @@
 
 Summary: Enhanced implementation of the mailx command
 Name: nail
-Version: 12.1
-Release: 2%{?dist}
+Version: 12.2
+Release: 1%{?dist}
 Group: 	Applications/Internet
 License: BSD
 URL: http://nail.sourceforge.net
 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,8 +102,9 @@
 
 
 %changelog
-* Fri Sep  1 2006 Dmitry Butskoy <Dmitry at Butskoy.name> - 12.1-2
-- rebuild for FC6
+* 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-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	16 Jun 2006 15:43:10 -0000	1.4
+++ sources	12 Jan 2007 14:01:14 -0000	1.5
@@ -1 +1 @@
-b78962f9384a9134adeb9ba1619aa6da  mailx-12.1.tar.bz2
+c13c24db8fb5f5d10b7ad148647f9909  mailx-12.2.tar.bz2


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