rpms/psi/FC-4 .cvsignore, 1.5, 1.6 psi.spec, 1.12, 1.13 sources, 1.6, 1.7

Aurelien Bompard (abompard) fedora-extras-commits at redhat.com
Thu Jan 12 19:03:33 UTC 2006 

Author: abompard

Update of /cvs/extras/rpms/psi/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29694/FC-4

Modified Files:
	.cvsignore psi.spec sources 
Log Message:
- version 0.10 final


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/psi/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	12 Jan 2005 21:11:58 -0000	1.5
+++ .cvsignore	12 Jan 2006 19:03:32 -0000	1.6
@@ -1,19 +1,5 @@
-psi_ca.qm.bz2
-psi_cs.qm.bz2
-psi_el.qm.bz2
-psi_es.qm.bz2
-psi_it.qm.bz2
-psi_mk.qm.bz2
-psi_se.qm.bz2
-psi-0.9.3.tar.bz2
-psi_de.qm.bz2
-psi_ee.qm.bz2
-psi_et.qm.bz2
-psi_fi.qm.bz2
-psi_fr.qm.bz2
-psi_nl.qm.bz2
-psi_pl.qm.bz2
-psi_ru.qm.bz2
-psi_sk.qm.bz2
-psi_sw.qm.bz2
-psi_zh.qm.bz2
+psi-0.10.tar.bz2
+emoticons-0.9.3.tar.gz
+systemicons-0.9.3.tar.gz
+rostericons-0.9.3.tar.gz
+psi-lang-packs-0.9.3.tar.gz


Index: psi.spec
===================================================================
RCS file: /cvs/extras/rpms/psi/FC-4/psi.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- psi.spec	1 Jun 2005 09:16:06 -0000	1.12
+++ psi.spec	12 Jan 2006 19:03:32 -0000	1.13
@@ -2,22 +2,21 @@
 %{!?_without_kde:%define with_kde 1}
 
 Name:       psi
-Version:    0.9.3
-Release:    4%{?dist}
-Summary:    Jabber client using Qt 3
+Version:    0.10
+Release:    1%{?dist}
+Summary:    Jabber client based on Qt
 License:    GPL
 Group:      Applications/Internet
 URL:        http://psi.affinix.com/
-Source0:    http://dl.sf.net/psi/psi-0.9.3.tar.bz2
+#Source0:    http://people.ex.ac.uk/kismith/psi/psi-0.10-test2.tar.bz2
+Source0:    http://dl.sf.net/psi/psi-0.10.tar.bz2
 Source2:    psi-uicwrapper.sh
 Patch1:     psi-0.9.2-strip.patch
-Patch2:     psi-0.9.2-mach-build.patch
-Patch3:     psi-0.9.3-gcc4.patch
+#Patch2:     psi-0.9.2-mach-build.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt-devel >= 1:3.1.1
-BuildRequires:  XFree86-devel
 BuildRequires:  zlib-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  qca-devel
@@ -29,49 +28,13 @@
 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
-
-# Emoticonsets
-Source100:   Chibi.jisp
-Source101:   KMess-Cartoon-1.0.jisp
-Source102:   shinyicons.jisp
-Source103:   yahoo_messenger.jisp
-Source104:   kreativ_squareheads.jisp
-Source105:   tlen.pl-3.73.jisp
-Source106:   apple_ichat-1.0.jisp
-Source107:   trill-extra-symbols.jisp
-Source108:   trill-extra-smileys.jisp
-Source109:   Ninja.jisp
-Source110:   webmessenger.jisp
-
-# Rostericonsets
-Source130:   weather.jisp
-Source131:   icqG.jisp
-Source132:   gaduGaduG.jisp
-Source133:   http://www.cs.kuleuven.ac.be/~remko/psi/crystal/crystal_roster.jisp
+Source10:   psi-lang-packs-0.9.3.tar.gz
+
+# Iconsets
+Source11:   emoticons-0.9.3.tar.gz
+Source12:   rostericons-0.9.3.tar.gz
+Source13:   systemicons-0.9.3.tar.gz
 
-# System iconsets
-Source160:   http://www.cs.kuleuven.ac.be/~remko/psi/crystal/crystal_system.jisp
 
 
 %description
@@ -113,8 +76,7 @@
 # (ugly) hack to enable debuginfo subrpm
 %patch1 -p1 -b .strip
 # needed to build with mach
-%patch2 -p1 -b .mach-build
-%patch3 -p1 -b .gcc4
+#%patch2 -p1 -b .mach-build
 
 
 %build
@@ -127,16 +89,15 @@
 ./configure                        \
         --prefix=%{_prefix}        \
         --bindir=%{_bindir}        \
-        --libdir=%{_datadir}/%name \
+        --datadir=%{_datadir}      \
         --qtdir=$QTDIR
 
 # Fix build for FC1
-make qmake
-install -m 755 %{SOURCE2} src/uic-wrapper
-sed -i 's|\$(QTDIR)/bin/uic|./uic-wrapper|' src/Makefile
+#make qmake
+#install -m 755 %{SOURCE2} src/uic-wrapper
+#sed -i 's|\$(QTDIR)/bin/uic|./uic-wrapper|' src/Makefile
 
 make %{?_smp_mflags}
-#lrelease psi.pro
 
 
 %install
@@ -144,78 +105,52 @@
 
 export INSTALL_ROOT=$RPM_BUILD_ROOT
 make install
-#rm -f $RPM_BUILD_ROOT%{_datadir}/%name/{README,COPYING}
 cp -p libpsi/iconset/ICONSET-HOWTO $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/
 
 # Install language packs
-%__bzip2 -dck %{SOURCE50} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_pl.qm
-#%__bzip2 -dck %{SOURCE51} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_sr.qm
-%__bzip2 -dck %{SOURCE52} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_fr.qm
-#%__bzip2 -dck %{SOURCE53} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_eo.qm
-#%__bzip2 -dck %{SOURCE54} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_sr at Latn.qm
-%__bzip2 -dck %{SOURCE55} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_fi.qm
-%__bzip2 -dck %{SOURCE56} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_cs.qm
-%__bzip2 -dck %{SOURCE57} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_ru.qm
-%__bzip2 -dck %{SOURCE58} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_de.qm
-%__bzip2 -dck %{SOURCE59} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_es.qm
-%__bzip2 -dck %{SOURCE60} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_mk.qm
-%__bzip2 -dck %{SOURCE61} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_nl.qm
-%__bzip2 -dck %{SOURCE62} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_sk.qm
-%__bzip2 -dck %{SOURCE63} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_el.qm
-%__bzip2 -dck %{SOURCE64} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_it.qm
-%__bzip2 -dck %{SOURCE65} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_se.qm
-%__bzip2 -dck %{SOURCE66} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_ca.qm
-%__bzip2 -dck %{SOURCE67} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_zh.qm
-%__bzip2 -dck %{SOURCE68} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_sw.qm
-%__bzip2 -dck %{SOURCE69} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_ee.qm
-%__bzip2 -dck %{SOURCE69} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_et.qm
+tar -xzpf %{SOURCE10} -C $RPM_BUILD_ROOT%{_datadir}/%name/
 
 ## Install iconsets
-install -p %{SOURCE100} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/emoticons/
-install -p %{SOURCE101} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/emoticons/
-install -p %{SOURCE102} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/emoticons/
-install -p %{SOURCE103} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/emoticons/
-install -p %{SOURCE104} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/emoticons/
-install -p %{SOURCE105} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/emoticons/
-install -p %{SOURCE106} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/emoticons/
-install -p %{SOURCE107} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/emoticons/
-install -p %{SOURCE108} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/emoticons/
-install -p %{SOURCE109} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/emoticons/
-install -p %{SOURCE110} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/emoticons/
-
-install -p %{SOURCE130} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/roster/
-install -p %{SOURCE131} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/roster/
-install -p %{SOURCE132} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/roster/
-install -p %{SOURCE133} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/roster/
+tar -xzpf %{SOURCE11} -C $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/emoticons/
+tar -xzpf %{SOURCE12} -C $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/roster/
+tar -xzpf %{SOURCE13} -C $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/system/
 
-install -p %{SOURCE160} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/system/
 
 # Menu
-perl -pi -e 's/Icon=psi/Icon=psi.png/' $RPM_BUILD_ROOT%{_datadir}/applnk/Internet/%{name}.desktop
+#perl -pi -e 's/Icon=psi/Icon=psi.png/' $RPM_BUILD_ROOT%{_datadir}/applnk/Internet/%{name}.desktop
 desktop-file-install --vendor fedora \
-                     --dir $RPM_BUILD_ROOT%{_datadir}/applications\
-                     --add-category Application\
-                     --add-category X-Fedora\
-                     --add-category Network\
-                     --delete-original\
-                     $RPM_BUILD_ROOT%{_datadir}/applnk/Internet/%{name}.desktop
-
-# icon
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
-ln -s ../icons/hicolor/48x48/apps/psi.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/%name.png
+       --dir $RPM_BUILD_ROOT%{_datadir}/applications\
+       --add-category Application\
+       --add-category X-Fedora\
+       --delete-original\
+       $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
+%post
+touch --no-create %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
+
 %files
 %defattr(0644,root,root,0755)
+# Needed by psi for the help dialog
 #%doc README COPYING libpsi/iconset/ICONSET-HOWTO
 %attr(0755,root,root) %{_bindir}/psi
 %{_datadir}/%{name}
 %_datadir/applications/*.desktop
 %{_datadir}/icons/hicolor/*/apps/%name.png
-%{_datadir}/pixmaps/%name.png
 %exclude %{_datadir}/%{name}/*.qm
 %exclude %{_datadir}/%{name}/iconsets/*/*.jisp
 
@@ -230,6 +165,24 @@
 
 
 %changelog
+* Thu Jan 12 2006 Aurelien Bompard <gauret[AT]free.fr> 0.10-1
+- version 0.10 final
+
+* Tue Jan 03 2006 Aurelien Bompard <gauret[AT]free.fr> 0.10-0.3.test4
+- version 0.10 test4
+
+* Thu Nov 03 2005 Aurelien Bompard <gauret[AT]free.fr> 0.10-0.2.test3
+- version 0.10 test3
+
+* Sat Oct 15 2005 Aurelien Bompard <gauret[AT]free.fr> 0.10-0.2.test2
+- version 0.10 test2
+- drop patch 3 (applied upstream)
+- drop icon symlink (useless)
+
+* Thu Aug 25 2005 Aurelien Bompard <gauret[AT]free.fr> 0.10-0.1.test1
+- version 0.10 test1
+- spec cleanups
+
 * Wed Jun  1 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.9.3-4
 - patch it for 64-bit/GCC 4
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/psi/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	13 Jan 2005 05:27:23 -0000	1.6
+++ sources	12 Jan 2006 19:03:32 -0000	1.7
@@ -1,35 +1,5 @@
-1689645b1e2bf181c6fc2d68f070cf0d  psi_ca.qm.bz2
-69f88fc4768d963bed4cd3ebfbb75a28  psi_cs.qm.bz2
-da61ff1ec70cf90357d78f6c81d0ad86  psi_el.qm.bz2
-c831c0924c363e8bac42aab577f6982d  psi_es.qm.bz2
-022996fd1f35f26a777f07d667071421  psi_it.qm.bz2
-3e1ac01eaf5451f1b1d0968b2f911983  psi_mk.qm.bz2
-8cc619e6752d6c4db5093eca5d458f0a  psi_se.qm.bz2
-d20f3bb530235a246bc2d92308089744  psi-0.9.3.tar.bz2
-52611e036dd0b7cb2ecadcf16eeb9632  psi_de.qm.bz2
-2e19193ebcfd59f80badf011714a2c82  psi_ee.qm.bz2
-2e19193ebcfd59f80badf011714a2c82  psi_et.qm.bz2
-74053f86b57bd74be4b2866dd02b730d  psi_fi.qm.bz2
-dd8f83f3c3fc1c20d094f6570acaad4b  psi_fr.qm.bz2
-a0cc2e82074a2be17c5ad0004747ac43  psi_nl.qm.bz2
-d3418d4383e47f37f7fedbbc9591db6c  psi_pl.qm.bz2
-5e701ee8f56b01c65f3097f5ba13f63c  psi_ru.qm.bz2
-784e291e51e4746b602e182ab9ec3ac2  psi_sk.qm.bz2
-a5570c823cfbe33ee602110b89cf4e16  psi_sw.qm.bz2
-38629928c813dc54fc04b38de5e6dcee  psi_zh.qm.bz2
-259f0351152852d8091b092440557bab  apple_ichat-1.0.jisp
-6d98db4a5fab3c5909a422d983ed336f  Chibi.jisp
-14f8bdbea1873b2972d56726c4c011cf  crystal_roster.jisp
-ee56b25a85ec3ddef64339e177f7028d  crystal_system.jisp
-a4aada51bbf57c17c2bfda5ba52717ec  gaduGaduG.jisp
-9d8b4be36909c235657d61698846aee1  icqG.jisp
-459d5feae7cf05210f10ffd8df9ac93f  KMess-Cartoon-1.0.jisp
-f1760382d3aea32199aeb7303493a9ea  kreativ_squareheads.jisp
-cbe6f581bf32a2cb56e8bf5871db639d  Ninja.jisp
-9ec2c600f390dc725e4793383ff50ec2  shinyicons.jisp
-099c70f9ca25623c89e3ba5b44af2e6d  tlen.pl-3.73.jisp
-6a3065d33b072e15decbfb3673028df6  trill-extra-smileys.jisp
-b743f3f65dfe526b6d730044031d5c78  trill-extra-symbols.jisp
-be98902383c572fd3cd6876a6940a73e  weather.jisp
-0a2ce25ab4506d563bf65da372c9f8f4  webmessenger.jisp
-747a785fdaae8dc5a5ee78a3253035ab  yahoo_messenger.jisp
+f0fd4ccf077f7b24e236f71c22649b7b  psi-0.10.tar.bz2
+0310084bf278d59831e4cac863e9060e  emoticons-0.9.3.tar.gz
+a359e33b1f2a8a80066771ebfbf4a916  systemicons-0.9.3.tar.gz
+79ade28d67356a4bdd57c850cc2ed6c8  rostericons-0.9.3.tar.gz
+57864bcb92feda6525cfade29f12c713  psi-lang-packs-0.9.3.tar.gz

More information about the fedora-extras-commits mailing list