rpms/nail/devel nail-12.0-nostrip.patch, NONE, 1.1 nail.spec, 1.9, 1.10 sources, 1.2, 1.3 nail-11.25-nostrip.patch, 1.1, NONE nail.html, 1.1, NONE

Dmitry Butskoy (buc) fedora-extras-commits at redhat.com
Tue Mar 21 15:23:53 UTC 2006


Author: buc

Update of /cvs/extras/rpms/nail/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26537

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


nail-12.0-nostrip.patch:

--- NEW FILE nail-12.0-nostrip.patch ---
diff -Nrbu nail-11.25/Makefile nail-11.25-OK/Makefile
--- nail-11.25/Makefile	2005-07-29 15:31:44.000000000 +0400
+++ nail-11.25-OK/Makefile	2005-10-17 12:45:26.000000000 +0400
@@ -96,7 +96,7 @@
 
 install: all
 	test -d $(DESTDIR)$(BINDIR) || mkdir -p $(DESTDIR)$(BINDIR)
-	$(UCBINSTALL) -c -s mailx $(DESTDIR)$(BINDIR)/mailx
+	$(UCBINSTALL) -c mailx $(DESTDIR)$(BINDIR)/mailx
 	test -d $(DESTDIR)$(MANDIR)/man1 || mkdir -p $(DESTDIR)$(MANDIR)/man1
 	$(UCBINSTALL) -c -m 644 mailx.1 $(DESTDIR)$(MANDIR)/man1/mailx.1
 	test -d $(DESTDIR)$(SYSCONFDIR) || mkdir -p $(DESTDIR)$(SYSCONFDIR)


Index: nail.spec
===================================================================
RCS file: /cvs/extras/rpms/nail/devel/nail.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- nail.spec	15 Feb 2006 12:21:25 -0000	1.9
+++ nail.spec	21 Mar 2006 15:23:52 -0000	1.10
@@ -1,18 +1,17 @@
 %define	use_nss	0
+%define rename	1
 
 Summary: Enhanced implementation of the mailx command
 Name: nail
-Version: 11.25
-Release: 6%{?dist}
+Version: 12.0
+Release: 1%{?dist}
 Group: 	Applications/Internet
 License: BSD
 URL: http://nail.sourceforge.net
-Source0: http://surfnet.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2
-# Note: it is just "lynx -source http://nail.sourceforge.net > nail.html"
-Source1: nail.html
+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-11.25-nostrip.patch
+Patch1: nail-12.0-nostrip.patch
 
 %if %{use_nss}
 BuildRequires: mozilla-nss-devel, mozilla-nspr-devel, pkgconfig
@@ -36,11 +35,29 @@
 
 
 %prep
-%setup -q
+%setup -q -n mailx-%{version}
 %patch0 -p1
 %patch1 -p1
 
-cp %{SOURCE1} %{name}.html
+%if %{rename}
+#  Use old name "nail" to avoid conflicts with the Core mailx package
+sed -i '/Heirloom/ {
+	p
+	n
+}
+s/mailx/nail/g
+' %{name}.rc
+
+mv mailx.1.html %{name}.html
+sed -i '/Heirloom/ {
+	p
+	n
+}
+s/mailx/nail/g
+s/MAILX/NAIL/g
+s/Mailx/Nail/g
+' %{name}.html
+%endif
 
 
 %build
@@ -56,7 +73,7 @@
 	BINDIR=%{_bindir} \
 	MANDIR=%{_mandir} \
 	SYSCONFDIR=%{_sysconfdir} \
-	MAILRC=%{_sysconfdir}/nail.rc \
+	MAILRC=%{_sysconfdir}/%{name}.rc \
 	MAILSPOOL=%{_localstatedir}/mail \
 	SENDMAIL=%{_sbindir}/sendmail \
 	UCBINSTALL=install \
@@ -69,6 +86,12 @@
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT `cat makeflags` install
 
+%if %{rename}
+# rename to old name "nail", to avoid conflicts with the Core mailx package
+mv -f $RPM_BUILD_ROOT%{_bindir}/mailx $RPM_BUILD_ROOT%{_bindir}/%{name}
+mv -f $RPM_BUILD_ROOT%{_mandir}/man1/mailx.1 $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1
+%endif
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -77,17 +100,17 @@
 %files
 %defattr(-,root,root)
 %doc COPYING AUTHORS README %{name}.html
-%config(noreplace) %{_sysconfdir}/nail.rc
-%{_bindir}/nail
-%{_mandir}/man1/nail*
+%config(noreplace) %{_sysconfdir}/%{name}.rc
+%{_bindir}/%{name}
+%{_mandir}/*/*
 
 
 %changelog
-* Wed Feb 15 2006 Dmitry Butskoy <Dmitry at Butskoy.name> - 11.25-6
-- rebuild for FC5
-
-* Wed Nov 16 2005 Dmitry Butskoy <Dmitry at Butskoy.name> - 11.25-5
-- rebuild.
+* Tue Mar 21 2006 Dmitry Butskoy <Dmitry at Butskoy.name> - 12.0-1
+- upgrade to 12.0
+- change new upstream name "mailx" to the old name "nail" to avoid
+  conflicts with the Core mailx package.
+- drop Source1, use package's html file instead.
 
 * Mon Oct 17 2005 Dmitry Butskoy <Dmitry at Butskoy.name> - 11.25-4
 - don't strip binaries on makeinstall (#170972)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nail/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Sep 2005 10:28:36 -0000	1.2
+++ sources	21 Mar 2006 15:23:52 -0000	1.3
@@ -1 +1 @@
-54f42db31911d734fcf37a89b72d4df7  nail-11.25.tar.bz2
+67e8236a73f8a2d85c45cf8a2bdf7af1  mailx-12.0.tar.bz2


--- nail-11.25-nostrip.patch DELETED ---


--- nail.html DELETED ---




More information about the fedora-extras-commits mailing list