rpms/logjam/FC-3 logjam-4.5-patch8-manfix.patch, NONE, 1.1 logjam.spec, 1.6, 1.7
Tom Callaway (spot)
fedora-extras-commits at redhat.com
Mon Jul 11 14:43:36 UTC 2005
Author: spot
Update of /cvs/extras/rpms/logjam/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3478/FC-3
Modified Files:
logjam.spec
Added Files:
logjam-4.5-patch8-manfix.patch
Log Message:
New version.
logjam-4.5-patch8-manfix.patch:
--- NEW FILE logjam-4.5-patch8-manfix.patch ---
--- logjam-4.5-patch8/doc/Makefile.in.BAD 2005-07-11 09:22:14.000000000 -0500
+++ logjam-4.5-patch8/doc/Makefile.in 2005-07-11 09:22:24.000000000 -0500
@@ -328,7 +328,7 @@
done
check-am: all-am
check: check-am
-all-am: Makefile $(MANS)
+all-am: Makefile
installdirs:
$(mkinstalldirs) $(DESTDIR)$(man1dir)
Index: logjam.spec
===================================================================
RCS file: /cvs/extras/rpms/logjam/FC-3/logjam.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- logjam.spec 11 Feb 2005 06:01:16 -0000 1.6
+++ logjam.spec 11 Jul 2005 14:43:34 -0000 1.7
@@ -1,37 +1,42 @@
%define use_xmms 1
-Name: logjam
-Version: 4.4.1
-Release: 3
-Epoch: 1
-Summary: The GTK2-client for LiveJournal
-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
+Name: logjam
+Version: 4.5
+Release: 0.1patch8%{?dist}
+Epoch: 1
+Summary: GTK2 client for LiveJournal
+License: GPL
+Group: User Interface/Desktops
+URL: http://logjam.danga.com/
+#This is where the final builds come from.
+#Source0: http://logjam.danga.com/download/logjam-%{version}.tar.bz2
+#This is an arch snapshot
+Source0: logjam-%{version}-patch8.tar.bz2
+Requires: curl >= 7.9, gtkspell
%if %{use_xmms}
-BuildRequires: xmms-devel
+BuildRequires: xmms-devel
%endif
-BuildRequires: curl-devel, gtk2-devel, gtkspell-devel, gtkhtml3-devel
-BuildRequires: gettext, desktop-file-utils, aspell-devel, librsvg2-devel
-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
-Patch3: logjam-4.4.1-gtkhtml3.1.patch
+BuildRequires: curl-devel, gtk2-devel, gtkspell-devel, gtkhtml3-devel
+BuildRequires: gettext, desktop-file-utils, aspell-devel, librsvg2-devel
+BuildRequires: libsoup-devel
+Obsoletes: loserjabber, logjam-gnome
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0: logjam-4.4.1-offline-segfaultfix.patch
+Patch1: logjam-4.4.1-rupo.patch
+Patch2: logjam-4.4.1-backdated.patch
+Patch3: logjam-4.4.1-cleanups.patch
+Patch4: logjam-4.4.1-fedora-desktop.patch
+Patch5: logjam-4.5-patch8-manfix.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
+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
@@ -39,17 +44,23 @@
%endif
%prep
-%setup -n %{name}-%{version} -q
+%setup -n %{name}-%{version}-patch8 -q
%patch0 -p1 -b .offline-segfaultfix
%patch1 -p1 -b .rupo
%patch2 -p1 -b .backdated
-%patch3 -p1 -b .gtkhtml31
+%patch3 -p1 -b .cleanups
+%patch4 -p1 -b .desktop
+%patch5 -p1 -b .manfix
%build
%configure \
%if %{use_xmms}
--with-xmms
%endif
+cp libtool protocol/liblivejournal
+cd gen
+./regen.sh
+cd ..
make
%install
@@ -57,19 +68,19 @@
mkdir -p $RPM_BUILD_ROOT
%makeinstall
%find_lang %{name}
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications
desktop-file-install --vendor fedora \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
- --add-category X-Fedora-Extras \
- %{SOURCE1}
+ --add-category X-Fedora \
+ --delete-original \
+ $RPM_BUILD_ROOT/%{_datadir}/applications/logjam.desktop
%files -f %{name}.lang
%defattr(-,root,root)
+%doc doc/README COPYING doc/TODO
%{_bindir}/logjam
%{_mandir}/man1/logjam.1.gz
%{_datadir}/applications/*.desktop
%{_datadir}/pixmaps/logjam*
-%doc doc/README COPYING doc/TODO
%if %{use_xmms}
%files xmms
@@ -80,6 +91,26 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Mon Jul 11 2005 Tom "spot" Callaway <tcallawa at redhat.com> 4.5-0.1patch8
+- bump to patch8
+
+* Thu Apr 14 2005 Tom "spot" Callaway <tcallawa at redhat.com> 4.4.1-8
+- actually apply patch. :P
+
+* Thu Apr 14 2005 Tom "spot" Callaway <tcallawa at redhat.com> 4.4.1-7
+- touch up package included .desktop file and use it.
+
+* Wed Apr 6 2005 Tom "spot" Callaway <tcallawa at redhat.com> 4.4.1-6
+- Fix dual .desktop file issue
+
+* Fri Mar 13 2005 Tom "spot" Callaway <tcallawa at redhat.com> 4.4.1-5
+- Cleanups for compiler errors brought to light in Bugzilla 149865
+- Change X-Fedora-Extras to X-Fedora
+
+* Fri Feb 25 2005 Tom "spot" Callaway <tcallawa at redhat.com> 4.4.1-4
+- Rebuilt for FC4/devel
+- Replace Gtkhtml 3.1 patch with Gtkhtml 3.6 patch
+
* Thu Feb 10 2005 Tom "spot" Callaway <tcallawa at redhat.com> 4.4.1-3
- Bump to current version
- Compile fix patch is obsoleted
@@ -140,7 +171,7 @@
* Tue Apr 29 2003 Tom "spot" Callaway <tcallawa at redhat.com>
- bump to 4.1.2
- and i follow the tracks that lead me down, i'll never follow whats right
-
+
* Sat Apr 12 2003 Tom "spot" Callaway <tcallawa at redhat.com>
- bump to 4.1.1
- black velvet with that slow southern style
@@ -163,7 +194,7 @@
* Mon Jan 07 2002 Tom "spot" Callaway <tcallawa at redhat.com>
- 3.0.2 release, spec cleanups
* Mon Nov 12 2001 Tom "spot" Callaway <tcallawa at redhat.com>
- - 3.0.1 release, lots of new features/bugfixes.
+ - 3.0.1 release, lots of new features/bugfixes.
* Fri Sep 07 2001 Tom "spot" Callaway <tcallawa at redhat.com>
- Rebuild without ssl for compat. :~(
* Thu Sep 06 2001 Tom "spot" Callaway <tcallawa at redhat.com>
More information about the scm-commits
mailing list