diff --git a/.cvsignore b/.cvsignore index 973dca3..ca88968 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -gajim-0.8.1.tar.bz2 +gajim-0.8.2.tar.bz2 diff --git a/gajim-0.8.1.remote.patch b/gajim-0.8.1.remote.patch deleted file mode 100644 index 0585665..0000000 --- a/gajim-0.8.1.remote.patch +++ /dev/null @@ -1,23 +0,0 @@ -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() diff --git a/gajim-0.8.cflags.patch b/gajim-0.8.cflags.patch deleted file mode 100644 index 7e69a89..0000000 --- a/gajim-0.8.cflags.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Nurp gajim-0.8.orig/src/common/Makefile gajim-0.8/src/common/Makefile ---- gajim-0.8.orig/src/common/Makefile 2005-08-19 09:47:31.000000000 +0200 -+++ gajim-0.8/src/common/Makefile 2005-08-20 11:26:17.000000000 +0200 -@@ -1,6 +1,7 @@ - # Set the C flags to include the GTK+ and Python libraries - PYTHONVER = `python -c 'import sys; print sys.version[:3]'` --CFLAGS = `pkg-config --cflags gtk+-2.0 pygtk-2.0` -fpic -I/usr/include/python$(PYTHONVER) -I. -+OPTFLAGS = -+CFLAGS = $(OPTFLAGS) `pkg-config --cflags gtk+-2.0 pygtk-2.0` -fpic -I/usr/include/python$(PYTHONVER) -I. - LDFLAGS = `pkg-config --libs gtk+-2.0 pygtk-2.0` - - all: idle.so -diff -Nurp gajim-0.8.orig/src/Makefile gajim-0.8/src/Makefile ---- gajim-0.8.orig/src/Makefile 2005-08-19 09:47:32.000000000 +0200 -+++ gajim-0.8/src/Makefile 2005-08-20 11:25:49.000000000 +0200 -@@ -1,6 +1,7 @@ - # Set the C flags to include the GTK+ and Python libraries - PYTHONVER = `python -c 'import sys; print sys.version[:3]'` --CFLAGS = `pkg-config --cflags gtk+-2.0 pygtk-2.0` -fPIC -I/usr/include/python$(PYTHONVER) -I. -+OPTFLAGS = -+CFLAGS = $(OPTFLAGS) `pkg-config --cflags gtk+-2.0 pygtk-2.0` -fPIC -I/usr/include/python$(PYTHONVER) -I. - LDFLAGS = `pkg-config --libs gtk+-2.0 pygtk-2.0` - - all: trayicon.so gtkspell.so diff --git a/gajim.spec b/gajim.spec index 7b897d1..fb8dc38 100644 --- a/gajim.spec +++ b/gajim.spec @@ -2,7 +2,7 @@ %define use_internal_modules 0 Name: gajim -Version: 0.8.1 +Version: 0.8.2 Release: 1%{?dist} Summary: Jabber client written in PyGTK @@ -10,11 +10,7 @@ Group: Applications/Internet License: GPL URL: http://gajim.org/ Source0: http://gajim.org/downloads/gajim-%{version}.tar.bz2 -Patch0: gajim-0.8.cflags.patch -Patch1: gajim-0.8.po.patch -Patch2: gajim-0.8.1.remote.patch -Patch3: gajim-0.8.aplay.patch -Patch4: gajim-0.8.x86_64.patch +Patch0: gajim-0.8.aplay.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -44,10 +40,6 @@ Gajim does not require GNOME to run, eventhough it exists with it nicely. %prep %setup -q %patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 %build @@ -77,12 +69,6 @@ desktop-file-install \ --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} @@ -98,11 +84,14 @@ rm -rf %{buildroot} %{_libdir}/gajim/ %{_datadir}/applications/*gajim.desktop %{_datadir}/gajim/ -%exclude %{_datadir}/gajim/src/systraywin32.py %{_datadir}/pixmaps/gajim* %{_mandir}/man1/gajim* %changelog +* Tue Sep 6 2005 Dawid Gajownik - 0.8.2-1 +- new version 0.8.2 +- remove patches .cflags, .po, .x86_64, .remote (pushed upstream) + * Sat Sep 3 2005 Dawid Gajownik - 0.8.1-1 - Version 0.8.1 - drop gajim-remote.py file (included in tarball) diff --git a/sources b/sources index 9d20120..e9f1590 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d4cbbd64078b9c93fdd1492c27dbcdab gajim-0.8.1.tar.bz2 +14b00f8ed7d84d90793782db7df40ec1 gajim-0.8.2.tar.bz2