rpms/gajim/FC-4 gajim-0.8.1.remote.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 gajim.spec, 1.4, 1.5 sources, 1.2, 1.3 gajim-0.8.remote.patch, 1.1, NONE gajim-remote.py, 1.1, NONE

[Dawid Gajownik (gajownik)]

Author: gajownik

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

Modified Files:
	.cvsignore gajim.spec sources 
Added Files:
	gajim-0.8.1.remote.patch 
Removed Files:
	gajim-0.8.remote.patch gajim-remote.py 
Log Message:
auto-import gajim-0.8.1-1 on branch FC-4 from gajim-0.8.1-1.src.rpm

gajim-0.8.1.remote.patch:

--- NEW FILE gajim-0.8.1.remote.patch ---
diff -Nurp gajim-0.8.1.orig/scripts/gajim-remote gajim-0.8.1/scripts/gajim-remote
--- gajim-0.8.1.orig/scripts/gajim-remote	2005-09-02 16:06:46.000000000 +0200
+++ gajim-0.8.1/scripts/gajim-remote	2005-09-03 11:04:13.000000000 +0200
@@ -22,6 +22,6 @@ if [ `id -u` -eq 0 ]; then
 	echo "You must not launch gajim-remote as root, it is INSECURE"
 fi
 
-cd PREFIX/share/gajim/scripts
+cd PREFIX/share/gajim/src
 export PYTHONPATH="$PYTHONPATH:PREFIXLIB/gajim"
 python gajim-remote.py $@
diff -Nurp gajim-0.8.1.orig/scripts/gajim-remote.py gajim-0.8.1/scripts/gajim-remote.py
--- gajim-0.8.1.orig/scripts/gajim-remote.py	2005-09-02 16:06:46.000000000 +0200
+++ gajim-0.8.1/scripts/gajim-remote.py	2005-09-03 11:05:11.000000000 +0200
@@ -32,7 +32,7 @@ import signal
 
 signal.signal(signal.SIGINT, signal.SIG_DFL) # ^C exits the application
 
-import i18n
+from common import i18n
 
 _ = i18n._
 i18n.init()


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gajim/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	24 Aug 2005 13:09:53 -0000	1.2
+++ .cvsignore	3 Sep 2005 10:16:54 -0000	1.3
@@ -1 +1 @@
-gajim-0.8.tar.bz2
+gajim-0.8.1.tar.bz2


Index: gajim.spec
===================================================================
RCS file: /cvs/extras/rpms/gajim/FC-4/gajim.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gajim.spec	24 Aug 2005 18:58:51 -0000	1.4
+++ gajim.spec	3 Sep 2005 10:16:54 -0000	1.5
@@ -2,19 +2,17 @@
 %define         use_internal_modules   0
 
 Name:           gajim
-Version:        0.8
-Release:        5%{?dist}
+Version:        0.8.1
+Release:        1%{?dist}
 Summary:        Jabber client written in PyGTK
 
 Group:          Applications/Internet
 License:        GPL
 URL:            http://gajim.org/
 Source0:        http://gajim.org/downloads/gajim-%{version}.tar.bz2
-# http://trac.gajim.org/file/trunk/scripts/gajim-remote.py?rev=3170&format=raw
-Source1:	http://trac.gajim.org/file/trunk/scripts/gajim-remote.py
 Patch0:         gajim-0.8.cflags.patch
 Patch1:         gajim-0.8.po.patch
-Patch2:         gajim-0.8.remote.patch
+Patch2:         gajim-0.8.1.remote.patch
 Patch3:         gajim-0.8.aplay.patch
 Patch4:         gajim-0.8.x86_64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -79,11 +77,15 @@
 	--delete-original \
 	%{buildroot}%{_datadir}/applications/gajim.desktop
 
+# These lines and gajim-0.8.1.remote.patch are a workaround 
+# for broken i18n module import
+mv %{buildroot}%{_datadir}/gajim/scripts/gajim-remote.py \
+	%{buildroot}%{_datadir}/gajim/src/gajim-remote.py
+rmdir %{buildroot}%{_datadir}/gajim/scripts
+
+
 %find_lang %{name}
 
-install -p -m 0755 %{SOURCE1} %{buildroot}%{_datadir}/gajim/src
-sed -e 's/^import i18n$/from common import i18n/g' -i \
-	%{buildroot}%{_datadir}/gajim/src/gajim-remote.py
 
 %clean
 rm -rf %{buildroot}
@@ -101,6 +103,10 @@
 %{_mandir}/man1/gajim*
 
 %changelog
+* Sat Sep  3 2005 Dawid Gajownik <gajownik[AT]fedora.pl> - 0.8.1-1
+- Version 0.8.1
+- drop gajim-remote.py file (included in tarball)
+
 * Wed Aug 24 2005 Dawid Gajownik <gajownik[AT]fedora.pl> - 0.8-5
 - Don't build internal modules
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gajim/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	24 Aug 2005 13:09:53 -0000	1.2
+++ sources	3 Sep 2005 10:16:54 -0000	1.3
@@ -1 +1 @@
-1f9b4864c56d744d1e6f1c0b42afc4e9  gajim-0.8.tar.bz2
+d4cbbd64078b9c93fdd1492c27dbcdab  gajim-0.8.1.tar.bz2


--- gajim-0.8.remote.patch DELETED ---


--- gajim-remote.py DELETED ---