rpms/xforms/devel xforms.spec,1.5,1.6

Matthias Saou (thias) fedora-extras-commits at redhat.com
Sat Mar 5 20:07:11 UTC 2005


Author: thias

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

Modified Files:
	xforms.spec 
Log Message:
Mass letter "x"," y" and "z" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: xforms.spec
===================================================================
RCS file: /cvs/extras/rpms/xforms/devel/xforms.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xforms.spec	10 Dec 2004 22:03:12 -0000	1.5
+++ xforms.spec	5 Mar 2005 20:07:09 -0000	1.6
@@ -1,19 +1,18 @@
 # $Id$
 
 # Since we're using xmkmf, we must match XFree86's notion of these
-%define _x11dir	/usr/X11R6
+%define _x11dir /usr/X11R6
 %define _prefix %{_x11dir}
 %define _mandir %{_prefix}/man
 
-Name:	 xforms
-Summary: An X11 toolkit library.
-Epoch:	 0
+Name:    xforms
+Summary: X11 toolkit library
 Version: 1.0
 Release: 2%{?dist_tag}
 License: LGPL
-Group:	 System Environment/Libraries
-Url:	 http://www.nongnu.org/xforms/ 
-Source:  http://savannah.nongnu.org/download/xforms/stable.pkg/%{version}/%{name}-%{version}.tar.gz 
+Group:   System Environment/Libraries
+URL:     http://www.nongnu.org/xforms/
+Source:  http://savannah.nongnu.org/download/xforms/stable.pkg/%{version}/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires: XFree86-devel
@@ -31,14 +30,14 @@
 It has now gone Open Source (LGPL).
 
 %package devel
-Summary: Development files for the xforms toolkit.
+Summary: Development files for the xforms toolkit
 Group: Development/Libraries
-Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name} = %{version}-%{release}
 # legacy versions included -designer/-static subpkgs
-Obsoletes: %{name}-designer < %{epoch}:%{version}-%{release}
-Provides:  %{name}-designer = %{epoch}:%{version}-%{release}
-Obsoletes: %{name}-static < %{epoch}:%{version}-%{release}
-Provides:  %{name}-static = %{epoch}:%{version}-%{release}
+Obsoletes: %{name}-designer < %{version}-%{release}
+Provides:  %{name}-designer = %{version}-%{release}
+Obsoletes: %{name}-static < %{version}-%{release}
+Provides:  %{name}-static = %{version}-%{release}
 %description devel
 This package contains development headers and libraries for %{name}.
 
@@ -47,7 +46,7 @@
 
 %prep
 
-%setup -q 
+%setup -q
 
 
 %build
@@ -55,14 +54,14 @@
 (unset RPM_OPT_FLAGS; xmkmf -a)
 
 make %{?_smp_mflags} \
-	CDEBUGFLAGS="$RPM_OPT_FLAGS" 
+    CDEBUGFLAGS="$RPM_OPT_FLAGS"
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 # makeinstall macro doesn't work for this pkg.
-make install install.man DESTDIR="$RPM_BUILD_ROOT" 
+make install install.man DESTDIR="$RPM_BUILD_ROOT"
 
 
 %clean
@@ -73,7 +72,7 @@
 %postun -p /sbin/ldconfig
 
 
-%files 
+%files
 %defattr(-,root,root)
 %doc *README Changes Copyright COPYING
 %{_libdir}/lib*.so.*




More information about the scm-commits mailing list