SPECS: gnuserv.spec - use standard requires_eq macro - noarch is g...

glen glen at pld-linux.org
Sun Jan 27 14:13:49 CET 2008


Author: glen                         Date: Sun Jan 27 13:13:49 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use standard requires_eq macro
- noarch is global option, move to first preamble
- rpmbuild macros for man symlinks discard

---- Files affected:
SPECS:
   gnuserv.spec (1.7 -> 1.8) 

---- Diffs:

================================================================
Index: SPECS/gnuserv.spec
diff -u SPECS/gnuserv.spec:1.7 SPECS/gnuserv.spec:1.8
--- SPECS/gnuserv.spec:1.7	Tue Feb 13 08:16:47 2007
+++ SPECS/gnuserv.spec	Sun Jan 27 14:13:44 2008
@@ -3,22 +3,21 @@
 Summary(pl.UTF-8):	Gnuserv - serwer dla Emacsa
 Name:		gnuserv
 Version:	3.12.6
-Release:	4
+Release:	5
 License:	GPL v2+
 Group:		Applications/Editors/Emacs
-Vendor:		Martin Schwenke <martin at meltin.net>
 Source0:	http://meltin.net/hacks/emacs/src/%{name}-%{version}.tar.gz
 # Source0-md5:	011a6644c193579245ca09eaae8c9850
 Patch0:		%{name}-mandir.patch
 URL:		http://meltin.net/hacks/emacs/
 BuildRequires:	autoconf
+BuildRequires:	rpmbuild(macros) >= 1.402
 Requires:	emacs
 Requires:	gnuserv-elisp = %{version}-%{release}
 Conflicts:	xemacs
+BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define version_of() %{expand:%%(rpm -q %1 --queryformat '%%%%{version}-%%%%{release}')}
-
 %description
 gnuserv allows you to attach to an already running Emacs. This allows
 external programs to make use of Emacs' editing capabilities. It is
@@ -33,9 +32,8 @@
 Summary:	Compiled elisp files for gnuserv
 Summary(pl.UTF-8):	Skompilowany kod elisp gnuserv
 Group:		Applications/Editors/Emacs
-BuildArch:	noarch
-Requires:	emacs = %{version_of emacs}
 Requires:	%{_bindir}/gnuserv
+%requires_eq emacs
 
 %description elisp
 Compiled elisp files for gnuserv
@@ -47,7 +45,6 @@
 Summary:	Source elisp files for gnuserv
 Summary(pl.UTF-8):	Kod źródłowy elisp gnuserv
 Group:		Applications/Editors/Emacs
-BuildArch:	noarch
 Requires:	%{name}-elisp = %{version}-%{release}
 
 %description elisp-el
@@ -89,12 +86,6 @@
 install -d $RPM_BUILD_ROOT%{_emacs_lispdir}
 install *.elc *.el $RPM_BUILD_ROOT%{_emacs_lispdir}
 
-for man in `find $RPM_BUILD_ROOT%{_mandir} -type l`; do
-	target=`readlink $man`
-	rm $man
-	echo ".so $target" > $man
-done
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -123,6 +114,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.8  2008-01-27 13:13:44  glen
+- use standard requires_eq macro
+- noarch is global option, move to first preamble
+- rpmbuild macros for man symlinks discard
+
 Revision 1.7  2007-02-13 07:16:47  glen
 - tabs in preamble
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/gnuserv.spec?r1=1.7&r2=1.8&f=u



More information about the pld-cvs-commit mailing list