rpms/jabbim/devel .cvsignore, 1.11, 1.12 jabbim.spec, 1.26, 1.27 sources, 1.20, 1.21 jabbim-0.4-stringlists-in-QVariants.diff, 1.2, NONE

[Michal Schmidt]

Author: michich

Update of /cvs/pkgs/rpms/jabbim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29691

Modified Files:
	.cvsignore jabbim.spec sources 
Removed Files:
	jabbim-0.4-stringlists-in-QVariants.diff 
Log Message:
* Sat Jan 17 2009 Michal Schmidt <mschmidt at redhat.com> - 0.5-0.1.svn20090117
- Rebase to upstream 0.5 SVN snapshot.
- Upstream now supports 'make install', which simplifies the spec file.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jabbim/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	3 Jul 2008 15:27:22 -0000	1.11
+++ .cvsignore	17 Jan 2009 21:59:19 -0000	1.12
@@ -1 +1 @@
-jabbim-0.4.3.tar.bz2
+jabbim-svn20090117.tar.bz2


Index: jabbim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jabbim/devel/jabbim.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- jabbim.spec	17 Jan 2009 06:41:22 -0000	1.26
+++ jabbim.spec	17 Jan 2009 21:59:19 -0000	1.27
@@ -1,29 +1,31 @@
 Name:		jabbim
-Version:	0.4.3
-Release:	5%{?dist}
+Version:	0.5
+Release:	0.1.svn20090117%{?dist}
 Summary:	Jabber client for mere mortals
 
 Group:		Applications/Internet
 License:	GPLv2+
 URL:		http://dev.jabbim.cz/jabbim
 # The source was obtained from upstream SVN repository:
-# svn export svn://dev.jabbim.cz/jabbim/tags/0.4.3 jabbim-0.4.3
-# tar -cjf jabbim-0.4.3.tar.bz2 jabbim-0.4.3/
-Source0:	jabbim-0.4.3.tar.bz2
+# svn export -r 4005 svn://dev.jabbim.cz/jabbim/trunk jabbim-svn20090117
+# tar -cjf jabbim-svn20090117.tar.bz2 jabbim-svn20090117/
+Source0:	jabbim-svn20090117.tar.bz2
 Source1:	jabbim.in
 Patch0:		jabbim-0.4-autoupdate-disable-notification.diff
-Patch1:		jabbim-0.4-stringlists-in-QVariants.diff
 BuildArch:	noarch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	python >= 2.5
 BuildRequires:	desktop-file-utils
+BuildRequires:	qt4-devel
 
 Requires:	python >= 2.5
 Requires:	PyQt4
 Requires:	python-twisted-names
 Requires:	python-twisted-web
+Requires:	python-twisted-web2
 Requires:	python-twisted-words
+Requires:	python-configobj
 Requires:	pyOpenSSL
 
 %define jabbimdata %{_datadir}/jabbim
@@ -36,54 +38,25 @@
 
 
 %prep
-%setup -q
+%setup -q -n jabbim-svn20090117
 %patch0 -p1
-%patch1 -p1
 # fill in the template for the starting script
 sed -e 's|@JABBIMDATA@|%{jabbimdata}|g' %{SOURCE1} > jabbim
 
 %build
+# Upstream likes to provide generated *.qm files in the tarballs.
+# Make sure they are recreated from the *.ts files:
+make clean
+make PREFIX=%{_prefix}
 
 %install
 rm -rf %{buildroot}
+make install DESTDIR=%{buildroot}
 
 desktop-file-install --vendor fedora \
 	--dir %{buildroot}%{_datadir}/applications \
 	--delete-original \
-	jabbim.desktop
-
-mkdir -p %{buildroot}/%{_bindir}
-install -p -m 755 jabbim %{buildroot}/%{_bindir}/jabbim
-rm jabbim
-
-# remove the files which are not useful for end-users
-# and files which upstream forgot to remove
-rm jabbim.sh jabbim.pro
-rm images/32x32/status/rsvg2png.sh
-rm widgets/preferences.py.orig
-
-mkdir -p %{buildroot}/%{jabbimdata}
-# take everything else upstream ships
-cp -a . %{buildroot}/%{jabbimdata}
-
-# these will be installed from their original location
-rm %{buildroot}/%{jabbimdata}/{AUTHORS,COPYING}
-
-for i in 16 22 32 48 ; do
-	d="%{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps"
-	install -dm 755 "$d"
-	install -m 644 -p images/${i}x${i}/apps/jabbim.png "$d/jabbim.png"
-done
-
-d="%{buildroot}%{_datadir}/icons/hicolor/scalable/apps"
-install -dm 755 "$d"
-install -m 644 -p images/scalable/apps/jabbim.svg "$d/jabbim.svg"
-
-install -dm 755 %{buildroot}/%{_datadir}/pixmaps
-pushd %{buildroot}/%{_datadir}/pixmaps
-ln -s ../icons/hicolor/48x48/apps/jabbim.png .
-ln -s ../icons/hicolor/scalable/apps/jabbim.svg .
-popd
+	%{buildroot}/%{_datadir}/applications/%{name}.desktop
 
 %clean
 rm -rf %{buildroot}
@@ -113,6 +86,10 @@
 
 
 %changelog
+* Sat Jan 17 2009 Michal Schmidt <mschmidt at redhat.com> - 0.5-0.1.svn20090117
+- Rebase to upstream 0.5 SVN snapshot.
+- Upstream now supports 'make install', which simplifies the spec file.
+
 * Sat Jan 17 2009 Michal Schmidt <mschmidt at redhat.com> - 0.4.3-5
 - Don't require python-sqlite2. Python >= 2.5 has sqlite support already.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jabbim/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	3 Jul 2008 15:27:22 -0000	1.20
+++ sources	17 Jan 2009 21:59:19 -0000	1.21
@@ -1 +1 @@
-bf9973631495cea7a21e625f76fa2545  jabbim-0.4.3.tar.bz2
+3c06b8a3bb1aacef7bebcecc04cee8df  jabbim-svn20090117.tar.bz2


--- jabbim-0.4-stringlists-in-QVariants.diff DELETED ---