rpms/psi/devel .cvsignore, 1.8, 1.9 psi.spec, 1.18, 1.19 sources, 1.10, 1.11

[Aurelien Bompard (abompard)]

Author: abompard

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

Modified Files:
	.cvsignore psi.spec sources 
Log Message:
* Wed Oct 17 2007 Aurelien Bompard <abompard at fedoraproject.org> 0.11-1
- version 0.11



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/psi/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	21 Feb 2006 17:57:38 -0000	1.8
+++ .cvsignore	29 Oct 2007 20:39:01 -0000	1.9
@@ -1,5 +1,4 @@
-psi-0.10.tar.bz2
 emoticons-0.10.tar.gz
-systemicons-0.9.3.tar.gz
-rostericons-0.10.tar.gz
+psi-0.11.tar.bz2
 psi-lang-packs-0.10.tar.gz
+rostericons-0.10.tar.gz


Index: psi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/psi/devel/psi.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- psi.spec	26 Aug 2007 09:41:30 -0000	1.18
+++ psi.spec	29 Oct 2007 20:39:01 -0000	1.19
@@ -1,31 +1,22 @@
-# Psi has no KDE-specific feature yet, but it's in the TODO list
-%{!?_without_kde:%define with_kde 1}
-
 Name:       psi
-Version:    0.10
-Release:    6%{?dist}
+Version:    0.11
+Release:    1%{?dist}
 Summary:    Jabber client based on Qt
-License:    GPLv2+
+License:    GPL
 Group:      Applications/Internet
 URL:        http://psi-im.org
-#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
+Source0:    http://dl.sf.net/psi/psi-%{version}.tar.bz2
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  qt-devel >= 1:3.1.1
-BuildRequires:  zlib-devel
-BuildRequires:  desktop-file-utils
-BuildRequires:  qca-devel
-%if 0%{?with_kde}
-BuildRequires:  kdelibs-devel
-%endif
-
-Requires:    sox
-Requires:    gnupg
+BuildRequires:  qt4-devel, zlib-devel, desktop-file-utils
+BuildRequires:  qca2-devel
+BuildRequires:  aspell-devel, libXScrnSaver-devel
+
+Requires(hint): sox
+Requires(hint): gnupg
+# Required for SSL/TLS connections
+Requires(hint): qca-ossl
 
 # Language packs
 Source10:   psi-lang-packs-0.10.tar.gz
@@ -53,7 +44,7 @@
 
 %description -n %name-i18n
 This package adds internationalization to Psi.
-If you want to add a translation from http://psi.affinix.com,
+If you want to add a translation from http://psi-im.org,
 just put the .qm file in %_datadir/%name (you'll have to do
 this as root), and restart psi.
 
@@ -73,29 +64,15 @@
 
 %prep
 %setup -q
-# (ugly) hack to enable debuginfo subrpm
-%patch1 -p1 -b .strip
-# needed to build with mach
-#%patch2 -p1 -b .mach-build
 
 
 %build
-[ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
-
-%if 0%{?with_kde}
-export KDEDIR=%(kde-config --prefix)
-%endif
-
+unset QTDIR
 ./configure                        \
         --prefix=%{_prefix}        \
         --bindir=%{_bindir}        \
         --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
+        --disable-bundled-qca
 
 make %{?_smp_mflags}
 
@@ -105,7 +82,6 @@
 
 export INSTALL_ROOT=$RPM_BUILD_ROOT
 make install
-cp -p libpsi/iconset/ICONSET-HOWTO $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/
 
 # Install language packs
 tar -xzpf %{SOURCE10} -C $RPM_BUILD_ROOT%{_datadir}/%name/
@@ -117,11 +93,8 @@
 
 
 # Menu
-#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\
        --delete-original\
        $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
@@ -145,8 +118,7 @@
 
 %files
 %defattr(0644,root,root,0755)
-# Needed by psi for the help dialog
-#%doc README COPYING libpsi/iconset/ICONSET-HOWTO
+%doc README COPYING
 %attr(0755,root,root) %{_bindir}/psi
 %{_datadir}/%{name}
 %_datadir/applications/*.desktop
@@ -165,9 +137,8 @@
 
 
 %changelog
-* Sun Aug 26 2007 Aurelien Bompard <abompard at fedoraproject.org> 0.10-6
-- fix license tag
-- rebuild for BuildID
+* Wed Oct 17 2007 Aurelien Bompard <abompard at fedoraproject.org> 0.11-1
+- version 0.11
 
 * Wed Aug 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 0.10-5
 - rebuild


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/psi/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	13 Apr 2006 10:15:12 -0000	1.10
+++ sources	29 Oct 2007 20:39:01 -0000	1.11
@@ -1,5 +1,4 @@
-f0fd4ccf077f7b24e236f71c22649b7b  psi-0.10.tar.bz2
 1b4b3374c676c330c87e2ef0cd9109fa  emoticons-0.10.tar.gz
-a359e33b1f2a8a80066771ebfbf4a916  systemicons-0.9.3.tar.gz
-51386c12abbee7100f092455bfb88bf1  rostericons-0.10.tar.gz
+6ccc81783eece7959140951289cf5310  psi-0.11.tar.bz2
 621a521ccd90a1e0272081e1a5ec7620  psi-lang-packs-0.10.tar.gz
+51386c12abbee7100f092455bfb88bf1  rostericons-0.10.tar.gz