rpms/psi/devel psi.spec,1.7,1.8

[Matthias Saou (thias)]

Author: thias

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

Modified Files:
	psi.spec 
Log Message:
Mass letter "o" and "p" 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: psi.spec
===================================================================
RCS file: /cvs/extras/rpms/psi/devel/psi.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- psi.spec	12 Jan 2005 21:11:58 -0000	1.7
+++ psi.spec	3 Mar 2005 23:53:13 -0000	1.8
@@ -5,7 +5,6 @@
 Version:    0.9.3
 Release:    1
 Summary:    Jabber client using QT3
-Epoch:      0
 License:    GPL
 Group:      Applications/Internet
 URL:        http://psi.affinix.com/
@@ -16,7 +15,7 @@
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	qt-devel >= 1:3.1.1
+BuildRequires:  qt-devel >= 1:3.1.1
 BuildRequires:  XFree86-devel
 BuildRequires:  zlib-devel
 BuildRequires:  desktop-file-utils
@@ -25,31 +24,31 @@
 BuildRequires:  kdelibs-devel
 %endif
 
-Requires:   sox
-Requires:   gnupg
+Requires:    sox
+Requires:    gnupg
 
 # Language packs
-Source50:	psi_pl.qm.bz2
-#Source51:	psi_sr.qm.bz2
-Source52:	psi_fr.qm.bz2
-#Source53:	psi_eo.qm.bz2
-#Source54:	psi_sr at Latn.qm.bz2
-Source55:	psi_fi.qm.bz2
-Source56:	psi_cs.qm.bz2
-Source57:	psi_ru.qm.bz2
-Source58:	psi_de.qm.bz2
-Source59:	psi_es.qm.bz2
-Source60:	psi_mk.qm.bz2
-Source61:	psi_nl.qm.bz2
-Source62:	psi_sk.qm.bz2
-Source63:	psi_el.qm.bz2
-Source64:	psi_it.qm.bz2
-Source65:	psi_se.qm.bz2
-Source66:	psi_ca.qm.bz2
-Source67:	psi_zh.qm.bz2
-Source68:	psi_sw.qm.bz2
-Source69:	psi_ee.qm.bz2
-Source70:	psi_et.qm.bz2
+Source50:    psi_pl.qm.bz2
+#Source51:    psi_sr.qm.bz2
+Source52:    psi_fr.qm.bz2
+#Source53:    psi_eo.qm.bz2
+#Source54:    psi_sr at Latn.qm.bz2
+Source55:    psi_fi.qm.bz2
+Source56:    psi_cs.qm.bz2
+Source57:    psi_ru.qm.bz2
+Source58:    psi_de.qm.bz2
+Source59:    psi_es.qm.bz2
+Source60:    psi_mk.qm.bz2
+Source61:    psi_nl.qm.bz2
+Source62:    psi_sk.qm.bz2
+Source63:    psi_el.qm.bz2
+Source64:    psi_it.qm.bz2
+Source65:    psi_se.qm.bz2
+Source66:    psi_ca.qm.bz2
+Source67:    psi_zh.qm.bz2
+Source68:    psi_sw.qm.bz2
+Source69:    psi_ee.qm.bz2
+Source70:    psi_et.qm.bz2
 
 # Emoticonsets
 Source100:   Chibi.jisp
@@ -83,9 +82,9 @@
 provides gateways to other protocols as AIM, ICQ, MSN and Yahoo!.
 
 %package -n %name-i18n
-Summary:	Language packs for Psi
-Group:		Applications/Internet
-Requires:	psi = 0:%version
+Summary:    Language packs for Psi
+Group:      Applications/Internet
+Requires:   psi = %version
 
 %description -n %name-i18n
 This package adds internationalization to Psi.
@@ -96,7 +95,7 @@
 %package -n %name-icons
 Summary:    Additional icons for Psi
 Group:      Applications/Internet
-Requires:   psi >= 0:0.9.1
+Requires:   psi >= 0.9.1
 
 %description -n %name-icons
 This package contains additional icons for Psi
@@ -121,11 +120,11 @@
 export KDEDIR=%(kde-config --prefix)
 %endif
 
-./configure                     \
-	--prefix=%{_prefix}     \
-	--bindir=%{_bindir}     \
-	--libdir=%{_datadir}/%name  \
-	--qtdir=$QTDIR
+./configure                        \
+        --prefix=%{_prefix}        \
+        --bindir=%{_bindir}        \
+        --libdir=%{_datadir}/%name \
+        --qtdir=$QTDIR
 
 # Fix build for FC1
 make qmake
@@ -205,7 +204,7 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files 
+%files
 %defattr(0644,root,root,0755)
 #%doc README COPYING libpsi/iconset/ICONSET-HOWTO
 %attr(0755,root,root) %{_bindir}/psi
@@ -216,7 +215,7 @@
 %exclude %{_datadir}/%{name}/*.qm
 %exclude %{_datadir}/%{name}/iconsets/*/*.jisp
 
-%files -n %name-i18n 
+%files -n %name-i18n
 %defattr(0644,root,root,0755)
 %{_datadir}/%name/%{name}_*.qm