rpms/logjam/devel logjam-4.4.1-backdated.patch, NONE, 1.1 logjam-4.4.1-offline-segfaultfix.patch, NONE, 1.1 logjam-4.4.1-rupo.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 logjam.spec, 1.3, 1.4 sources, 1.2, 1.3 logjam-4.4.0-compilefix.patch, 1.1, NONE logjam-4.4.0-gtkhtml3.1.patch, 1.1, NONE

Tom Callaway (spot) fedora-extras-commits at redhat.com
Fri Feb 11 05:39:27 UTC 2005 

Author: spot

Update of /cvs/extras/rpms/logjam/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23902/devel

Modified Files:
	.cvsignore logjam.spec sources 
Added Files:
	logjam-4.4.1-backdated.patch 
	logjam-4.4.1-offline-segfaultfix.patch logjam-4.4.1-rupo.patch 
Removed Files:
	logjam-4.4.0-compilefix.patch logjam-4.4.0-gtkhtml3.1.patch 
Log Message:
auto-import logjam-4.4.1-1 on branch devel from logjam-4.4.1-1.src.rpm

logjam-4.4.1-backdated.patch:

--- NEW FILE logjam-4.4.1-backdated.patch ---
--- logjam-4.4.1/protocol/liblivejournal/livejournal/entry.c.BAD	2005-02-10 23:19:30.000000000 -0600
+++ logjam-4.4.1/protocol/liblivejournal/livejournal/entry.c	2005-02-10 23:20:38.000000000 -0600
@@ -590,6 +590,12 @@ rfc822_load_entry(const char *key, const
 	else if (g_ascii_strcasecmp(key, "time") == 0) {
 		if (entry) lj_ljdate_to_tm(val, &entry->time);
 	}
+	else if (g_ascii_strcasecmp(key, "backdated") == 0) {
+		if (entry && val[0]) {
+			if (g_ascii_strcasecmp(val, "yes") == 0)
+				entry->backdated = TRUE;
+		}
+	}
 	else return FALSE;
 
 	return TRUE;

logjam-4.4.1-offline-segfaultfix.patch:

--- NEW FILE logjam-4.4.1-offline-segfaultfix.patch ---
--- logjam-4.4.1/src/offline.c.BAD	2005-02-10 23:14:24.000000000 -0600
+++ logjam-4.4.1/src/offline.c	2005-02-10 23:14:43.000000000 -0600
@@ -606,7 +606,7 @@ offline_jump_to_online(OfflineUI *oui) {
 static void
 offline_copy_link(OfflineUI *oui) {
 	gchar *url = offline_current_entry_link(oui);
-	if (*url != '\0')
+	if ((url) && (*url != '\0'))
 		gtk_clipboard_set_text(gtk_clipboard_get(GDK_SELECTION_CLIPBOARD),
 				url, -1 /* determine length automatically */);
 	g_free(url);

logjam-4.4.1-rupo.patch:

--- NEW FILE logjam-4.4.1-rupo.patch ---
--- logjam-4.4.1/po/ru_RU.po-orig	2005-01-07 02:38:02.764528295 +0300
+++ logjam-4.4.1/po/ru_RU.po	2005-01-07 02:40:48.109208709 +0300
@@ -13,7 +13,7 @@
 "Project-Id-Version: LogJam 4.4.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2005-01-03 01:13-0800\n"
-"PO-Revision-Date: 2004-04-01 11:00+0400\n"
+"PO-Revision-Date: 2005-01-07 02:40+0400\n"
 "Last-Translator: Kir Kolyshkin <kir at sacred.ru>\n"
 "Language-Team: Russian\n"
 "MIME-Version: 1.0\n"
@@ -283,9 +283,8 @@
 msgstr "готово.\n"
 
 #: src/cmdline.c:565
-#, fuzzy
 msgid "Error: specify a user.\n"
-msgstr "Ошибка:  Необходимо указать учётную запись.\n"
+msgstr "Ошибка: укажите пользователя.\n"
 
 #: src/cmdline.c:627
 #, c-format
@@ -1788,7 +1787,7 @@
 
 #: src/pollcreator.c:89
 msgid "Nobody"
-msgstr ""
+msgstr "Никто"
 
 #: src/pollcreator.c:92
 msgid "_Results visible to:"


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/logjam/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Feb 2005 23:17:20 -0000	1.2
+++ .cvsignore	11 Feb 2005 05:39:25 -0000	1.3
@@ -1 +1 @@
-logjam-4.4.0.tar.bz2
+logjam-4.4.1.tar.bz2


Index: logjam.spec
===================================================================
RCS file: /cvs/extras/rpms/logjam/devel/logjam.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- logjam.spec	10 Feb 2005 15:22:45 -0000	1.3
+++ logjam.spec	11 Feb 2005 05:39:25 -0000	1.4
@@ -1,32 +1,53 @@
+%define use_xmms 1
+
 Name: logjam
-Version: 4.4.0
+Version: 4.4.1
+Release: 1
+Epoch: 1
 Summary: The GTK2-client for LiveJournal
-Release: 5
+License: GPL
+Group: User Interface/Desktops
+URL: http://logjam.danga.com/
 Source: http://logjam.danga.com/download/logjam-%{version}.tar.bz2
 Source1: logjam.desktop
 Requires: curl >= 7.9, gtkspell
-BuildRequires: curl-devel, gtk2-devel, gtkspell-devel, xmms-devel, gtkhtml3-devel 
+%if %{use_xmms}
+BuildRequires: xmms-devel
+%endif
+BuildRequires: curl-devel, gtk2-devel, gtkspell-devel, gtkhtml3-devel
 BuildRequires: gettext-devel, desktop-file-utils, aspell-devel, librsvg2-devel
-URL: http://logjam.danga.com/
-Patch0: logjam-4.4.0-compilefix.patch
-Patch1: logjam-4.4.0-gtkhtml3.1.patch
-Epoch: 1
-
-License: GPL
-Group: User Interface/Desktops
-BuildRoot: %{_tmppath}/logjam-%{version}.root
 Obsoletes: loserjabber, logjam-gnome
+BuildRoot: %{_tmppath}/logjam-%{version}.root
+Patch0: logjam-4.4.1-offline-segfaultfix.patch
+Patch1: logjam-4.4.1-rupo.patch
+Patch2: logjam-4.4.1-backdated.patch
 
 %description
 This is the new GTK2 client for LiveJournal (http://www.livejournal.com).
 
+%if %{use_xmms}
+%package xmms
+Summary: LogJam helper binary
+Group: User Interface/Desktops
+Requires: logjam, xmms
+BuildRequires: xmms-devel
+
+%description xmms
+This is a helper binary for LogJam which is used to get the
+current music from XMMS.
+%endif
+
 %prep
 %setup -n %{name}-%{version} -q
-%patch0 -p1 -b .compilefix
-%patch1 -p1 -b .gtkhtml31
+%patch0 -p1 -b .offline-segfaultfix
+%patch1 -p1 -b .rupo
+%patch2 -p1 -b .backdated
 
 %build
-%configure
+%configure \
+%if %{use_xmms}
+	--with-xmms
+%endif
 make
 
 %install
@@ -43,16 +64,30 @@
 %files -f %{name}.lang
 %defattr(-,root,root)
 %{_bindir}/logjam
-%{_bindir}/logjam-xmms-client
 %{_mandir}/man1/logjam.1.gz
 %{_datadir}/applications/*.desktop
 %{_datadir}/pixmaps/logjam*
 %doc doc/README COPYING doc/TODO 
 
+%if %{use_xmms}
+%files xmms
+%{_bindir}/logjam-xmms-client
+%endif
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Thu Feb 10 2005 Tom "spot" Callaway <tcallawa at redhat.com> 4.4.1-1
+- Bump to current version
+- Compile fix patch is obsoleted
+- Gtkhtml 3.1 patch is obsoleted
+- Adopt some changes from Kir Kolyshkin's package
+  - Make xmms subpackage, with use_xmms conditional
+  - Fix a segfault triggered by pressing "Copy URL" button in offline browser
+  - Fix Russian localization
+  - Adds support for Backdated: yes option in an offline logjam post file.
+
 * Wed Feb  9 2005 Tom "spot" Callaway <tcallawa at redhat.com> 4.4.0-4
 - use make, not %__make
 - no need to export CFLAGS first


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/logjam/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Feb 2005 23:17:20 -0000	1.2
+++ sources	11 Feb 2005 05:39:25 -0000	1.3
@@ -1 +1 @@
-7ff366dee32d354338132bfd5c5adb46  logjam-4.4.0.tar.bz2
+f16f68a4a6b15fb5bb650614f3ff081c  logjam-4.4.1.tar.bz2


--- logjam-4.4.0-compilefix.patch DELETED ---


--- logjam-4.4.0-gtkhtml3.1.patch DELETED ---

More information about the fedora-extras-commits mailing list