rpms/psi/F-10 .cvsignore, 1.11, 1.12 psi.spec, 1.26, 1.27 sources, 1.13, 1.14

Aurelien Bompard abompard at fedoraproject.org
Wed Jul 29 20:42:29 UTC 2009


Author: abompard

Update of /cvs/pkgs/rpms/psi/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22628/F-10

Modified Files:
	.cvsignore psi.spec sources 
Log Message:
* Tue Jul 28 2009 Aurelien Bompard <abompard at fedoraproject.org> - 0.13-1
- 0.13 final



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/psi/F-10/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	3 Mar 2009 22:42:48 -0000	1.11
+++ .cvsignore	29 Jul 2009 20:42:29 -0000	1.12
@@ -1,4 +1,4 @@
+psi-0.13.tar.bz2
 emoticons-0.10.tar.gz
-psi-lang-packs-0.12.tar.gz
+psi-lang-packs-0.13-1.tar.gz
 rostericons-0.10.tar.gz
-psi-0.12.1.tar.bz2


Index: psi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/psi/F-10/psi.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- psi.spec	28 Mar 2009 18:06:00 -0000	1.26
+++ psi.spec	29 Jul 2009 20:42:29 -0000	1.27
@@ -1,18 +1,17 @@
 Name:       psi
-Version:    0.12.1
-Release:    2%{?dist}
+Version:    0.13
+Release:    1%{?dist}
 Summary:    Jabber client based on Qt
 License:    GPLv2+
 Group:      Applications/Internet
 URL:        http://psi-im.org
 Source0:    http://dl.sf.net/psi/psi-%{version}.tar.bz2
 Patch0:     psi-0.12-qca.patch
-Patch1:     psi-0.12-qt-4_5-compatibility.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt4-devel, zlib-devel, desktop-file-utils
-BuildRequires:  qca2-devel
+BuildRequires:  qca2-devel, glib2-devel
 BuildRequires:  aspell-devel, libXScrnSaver-devel
 
 Requires(hint): sox
@@ -23,7 +22,7 @@ Requires(hint): qca-ossl
 Requires(hint): qca-gnupg
 
 # Language packs
-Source10:   psi-lang-packs-0.12.tar.gz
+Source10:   psi-lang-packs-0.13-1.tar.gz
 
 # Iconsets
 Source11:   emoticons-0.10.tar.gz
@@ -69,14 +68,13 @@ More icons can be found on http://jisp.n
 %prep
 %setup -q
 %patch0 -p0 -b .qca
-%patch1 -p0 -b .qt45
-
 
 %build
 unset QTDIR
 ./configure                        \
         --prefix=%{_prefix}        \
         --bindir=%{_bindir}        \
+        --libdir=%{_libdir}        \
         --datadir=%{_datadir}      \
         --disable-bundled-qca
 
@@ -91,6 +89,7 @@ make install
 
 # Install language packs
 tar -xzpf %{SOURCE10} -C $RPM_BUILD_ROOT%{_datadir}/%name/
+rm -f $RPM_BUILD_ROOT%{_datadir}/%name/getlangs.sh
 
 ## Install iconsets
 tar -xzpf %{SOURCE11} -C $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/emoticons/
@@ -104,6 +103,7 @@ desktop-file-install --vendor fedora \
        --delete-original\
        $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -129,6 +129,8 @@ fi
 %{_datadir}/%{name}
 %_datadir/applications/*.desktop
 %{_datadir}/icons/hicolor/*/apps/%name.png
+%dir %{_libdir}/%{name}/
+%dir %{_libdir}/%{name}/plugins/
 %exclude %{_datadir}/%{name}/*.qm
 %exclude %{_datadir}/%{name}/iconsets/*/*.jisp
 
@@ -143,11 +145,40 @@ fi
 
 
 %changelog
+* Tue Jul 28 2009 Aurelien Bompard <abompard at fedoraproject.org> - 0.13-1
+- 0.13 final
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.13-0.3.rc4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Fri Jul 17 2009 Sven Lankes <sven at lank.es> 0.13-0.2.rc4
+- 0.13 rc4
+
+* Mon Jul 13 2009 Sven Lankes <sven at lank.es> 0.13-0.2.rc3
+- 0.13 rc3
+- remove qt 4.5 patch
+
+* Thu Jul 05 2009 Sven Lankes <sven at lank.es> 0.13-0.2.rc2
+- own plugin directories (bz #509683)
+
+* Thu Jul 02 2009 Sven Lankes <sven at lank.es> 0.13-0.1.rc2
+- 0.13 rc2
+
+* Sun May 24 2009 Aurelien Bompard <abompard at fedoraproject.org> 0.13-0.1.rc1
+- 0.13 rc1
+
 * Sat Mar 28 2009 Sven Lankes <sven at lank.es> 0.12.1-2
-- add patch for allow psi to work with Qt 4.5
+- bump Version to avoid newer EVR in F9/F10
 
 * Tue Mar 03 2009 Sven Lankes <sven at lank.es> 0.12.1-1
-- version 0.12.1
+- Update to 0.12.1 (fix for CVE-2008-6393)
+- add patch for qt 4.5 support
+
+* Sun Mar 01 2009 Robert Scheck <robert at fedoraproject.org> 0.12-3
+- Added missing build requirement to glib2-devel
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.12-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
 * Wed Aug 13 2008 Aurelien Bompard <abompard at fedoraproject.org> 0.12-1
 - version 0.12


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/psi/F-10/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	3 Mar 2009 22:42:48 -0000	1.13
+++ sources	29 Jul 2009 20:42:29 -0000	1.14
@@ -1,4 +1,4 @@
+ddc1a2a35dc155ca46ad6ecaeccdf894  psi-0.13.tar.bz2
 1b4b3374c676c330c87e2ef0cd9109fa  emoticons-0.10.tar.gz
-054311487f6bad8e749b6034461bb293  psi-lang-packs-0.12.tar.gz
+749688094206e3282e466ee696998290  psi-lang-packs-0.13-1.tar.gz
 51386c12abbee7100f092455bfb88bf1  rostericons-0.10.tar.gz
-da273e45daef04ffc8338708e96e9173  psi-0.12.1.tar.bz2




More information about the fedora-extras-commits mailing list