rpms/jabbim/devel .cvsignore, 1.5, 1.6 jabbim.spec, 1.12, 1.13 sources, 1.12, 1.13

Michal Schmidt (michich) fedora-extras-commits at redhat.com
Mon Mar 3 13:00:33 UTC 2008


Author: michich

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

Modified Files:
	.cvsignore jabbim.spec sources 
Log Message:
* Mon Mar  3 2008 Michal Schmidt <mschmidt at redhat.com> - 0.4-0.1.20080303svn
- Upstream SVN revision 2369.
- Upgrading from 0.3 should be without problems (old copies of plugins
  in ~/.jabbim/plugins are harmless, config settings are preserved,
  archive is converted).



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jabbim/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	19 Jan 2008 09:58:22 -0000	1.5
+++ .cvsignore	3 Mar 2008 12:59:53 -0000	1.6
@@ -1 +1 @@
-jabbim-0.3.tgz
+jabbim-svn.tar.bz2


Index: jabbim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jabbim/devel/jabbim.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- jabbim.spec	19 Jan 2008 09:58:22 -0000	1.12
+++ jabbim.spec	3 Mar 2008 12:59:53 -0000	1.13
@@ -1,13 +1,15 @@
 Name:		jabbim
-Version:	0.3
-Release:	1%{?dist}
+Version:	0.4
+Release:	0.1.20080303svn%{?dist}
 Summary:	Jabber client for mere mortals
 
 Group:		Applications/Internet
 License:	GPLv2+
 URL:		http://dev.jabbim.cz/jabbim
-# Downloaded from HanzZ's jdisk: http://disk.jabbim.cz/pyjim@jabber.cz/jabbim-0.3.tgz
-Source0:	jabbim-0.3.tgz
+# The source was obtained from upstream SVN repository:
+# svn export -r 2369 svn://dev.jabbim.cz/jabbim/trunk jabbim-svn
+# tar -cjf jabbim-svn.tar.bz2 jabbim-svn/
+Source0:	jabbim-svn.tar.bz2
 Source1:	jabbim.in
 BuildArch:	noarch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -33,7 +35,7 @@
 
 
 %prep
-%setup -q
+%setup -q -n jabbim-svn
 # fill in the template for the starting script
 sed -e 's|@JABBIMDATA@|%{jabbimdata}|g' %{SOURCE1} > jabbim
 
@@ -50,11 +52,21 @@
 mkdir -p %{buildroot}/%{_bindir}
 install -p -m 755 jabbim %{buildroot}/%{_bindir}/jabbim
 rm jabbim
+install -p -m 755 plugins/remote/jabbim_remote.py %{buildroot}/%{_bindir}/jabbim_remote
+rm plugins/remote/jabbim_remote.py
 
 # remove the files which are not useful for end-users
 # and files which upstream forgot to remove
-rm jabbim.sh
+rm jabbim.sh jabbim.pro epydoc.cfg test.py gui-test.py
+rm locales/jabbim_{cs,en,sk,pl,fr}.ts
 rm images/32x32/status/rsvg2png.sh
+rm themes/web2/style.css~
+rm plugins/dcoper/cs.qm
+find plugins -name '*.ts' | xargs rm
+# XXX: what about 'scalable' dir?
+find images -name '*.svg' | xargs rm
+
+chmod +x plugins/format/{textile,markdown}.py
 
 mkdir -p %{buildroot}/%{jabbimdata}
 # take everything else upstream ships
@@ -93,6 +105,7 @@
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING
 %{_bindir}/jabbim
+%{_bindir}/jabbim_remote
 %{_datadir}/applications/fedora-jabbim.desktop
 %{_datadir}/icons/hicolor/*/apps/jabbim.png
 %{_datadir}/pixmaps/jabbim.png
@@ -100,6 +113,12 @@
 
 
 %changelog
+* Mon Mar  3 2008 Michal Schmidt <mschmidt at redhat.com> - 0.4-0.1.20080303svn
+- Upstream SVN revision 2369.
+- Upgrading from 0.3 should be without problems (old copies of plugins
+  in ~/.jabbim/plugins are harmless, config settings are preserved,
+  archive is converted).
+
 * Thu Jan 17 2008 Michal Schmidt <mschmidt at redhat.com> - 0.3-1
 - Upstream release 0.3 "PERUN".
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jabbim/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	19 Jan 2008 09:58:22 -0000	1.12
+++ sources	3 Mar 2008 12:59:53 -0000	1.13
@@ -1 +1 @@
-bd2dd704a6ef1b3799185c2e467aa08b  jabbim-0.3.tgz
+d4b5e625976b732450a57ee98d9902ae  jabbim-svn.tar.bz2




More information about the fedora-extras-commits mailing list