Hello community,
here is the log from the commit of package blam
checked in at Thu Mar 15 01:12:48 CET 2007.
--------
--- GNOME/blam/blam.changes 2007-01-25 00:59:47.000000000 +0100
+++ /mounts/work_src_done/STABLE/blam/blam.changes 2007-03-13 21:32:11.841942000 +0100
@@ -1,0 +2,7 @@
+Tue Mar 13 21:31:10 CET 2007 - jhargadon@suse.de
+
+- update to version 1.8.4
+- specfile cleanup
+- This update resolves bug #244584
+
+-------------------------------------------------------------------
Old:
----
blam-1.8.2.tar.bz2
blam-QuitActivated-fix.patch
blam-secure-paths.patch
blam-x86_64-crash.patch
blam-xulrunner.patch
New:
----
blam-1.8.4.tar.bz2
blam-bgo407385.patch
blam-bgo417904.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ blam.spec ++++++
--- /var/tmp/diff_new_pack.Z31224/_old 2007-03-15 01:12:14.000000000 +0100
+++ /var/tmp/diff_new_pack.Z31224/_new 2007-03-15 01:12:14.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package blam (Version 1.8.2)
+# spec file for package blam (Version 1.8.4)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -13,26 +13,31 @@
Name: blam
# Must be the same as for gecko-sharp:
%define xulrunner_version 181
-BuildRequires: gcc-c++ gconf-sharp gecko-sharp glade-sharp gnome-sharp gnutls-devel intltool libglade2-devel libgnomeprintui-devel libgnomeui-devel libwnck-devel mDNSResponder-devel mono-basic mono-data-sqlite mono-devel perl-XML-Parser update-desktop-files
+BuildRequires: gcc-c++ gconf-sharp2 gconf2-devel gecko-sharp2 glib-sharp2 gnome-sharp2 gtk-sharp2 gtk2-devel intltool libgnomeui-devel mono-devel update-desktop-files
+# This is optional and adds a dependency on the deprecated dbus-1-mono package.
+# BuildRequires: dbus-1-mono
+# See http://bugzilla.gnome.org/show_bug.cgi?id=417934
%define prefix /usr
%define sysconfdir /etc/
License: GNU General Public License (GPL)
Group: Productivity/Other
Autoreqprov: on
Requires: mono-core
-Version: 1.8.2
-Release: 79
+Version: 1.8.4
+Release: 1
Summary: GNOME/GTK# RSS Aggregator
URL: http://www.imendio.com/projects/blam/
Source: %{name}-%{version}.tar.bz2
Patch: %{name}-desktop.patch
-Patch1: %{name}-secure-paths.patch
-Patch2: %{name}-xulrunner.patch
-Patch3: blam-QuitActivated-fix.patch
-Patch4: blam-x86_64-crash.patch
+# This is a backport from upstream and should be dropped
+# when upgrading to blam > 1.8.4.
+Patch1: blam-bgo407385.patch
+# This has been submitted upstream and should be dropped
+# when applied upstream.
+Patch2: blam-bgo417904.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Requires: gecko-sharp
-Requires: gtk-sharp
+Requires: gecko-sharp2
+Requires: gtk-sharp2
%if %suse_version > 1010 || 0%{?opensuse_bs}
BuildRequires: mozilla-xulrunner%{xulrunner_version}-devel
Requires: mozilla-xulrunner%{xulrunner_version}
@@ -47,6 +52,8 @@
%endif
Requires: mono-web
+%gconf_schemas_prereq
+
%description
Blam is a tool that helps you keep track of the growing number of news
feeds distributed as RSS. Blam lets you subscribe to any number of
@@ -60,68 +67,49 @@
Mikael Hallendal
%prep
-%setup
+%setup -q
%patch -p1
%patch1
%patch2
-%patch3 -p1
-%patch4
%build
-rename no nb po/no.*
-sed "s/\(ALL_LINGUAS.*\) no /\1 nb /" configure.in > configure.in.tmp && \
- mv configure.in.tmp configure.in
-libtoolize -f
-aclocal -I .
-autoconf
-automake
-CFLAGS="$RPM_OPT_FLAGS" \
- ./configure \
- --prefix=%prefix \
- --libdir=%prefix/%_lib \
- --libexecdir=%prefix/lib/nautilus \
- --sysconfdir=%sysconfdir \
- --datadir=%prefix/share \
- --localstatedir=/var/%_lib \
- --with-kde-datadir=/opt/kde3/share
-make
+autoreconf -f -i
+%configure \
+ --disable-static \
+ --disable-schemas-install
+make %{?jobs:-j %jobs}
%install
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-make install DESTDIR=$RPM_BUILD_ROOT
-unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
-#cd po
-#for gmo in *.gmo ; do
-# install -d $RPM_BUILD_ROOT/usr/share/locale/${gmo%.gmo}/LC_MESSAGES
-# install -m0644 $gmo $RPM_BUILD_ROOT/usr/share/locale/${gmo%.gmo}/LC_MESSAGES/blam.mo
-#done
-#cd ..
-%suse_update_desktop_file blam
-#rm $RPM_BUILD_ROOT%{prefix}/lib/blam/*.*a
+make install DESTDIR="$RPM_BUILD_ROOT"
+%suse_update_desktop_file %{name}
%find_lang %{name}
+%find_gconf_schemas
+cat %{name}.lang %{name}.schemas_list > %{name}.lst
+
+%pre -f %{name}.schemas_pre
-%post
-%run_ldconfig
-export GCONF_CONFIG_SOURCE=`/usr/bin/gconftool-2 --get-default-source`
+%posttrans -f %{name}.schemas_posttrans
+
+%preun -f %{name}.schemas_preun
%clean
rm -rf $RPM_BUILD_ROOT
-%files -f %{name}.lang
+%files -f %{name}.lst
%defattr(-, root, root)
%doc AUTHORS NEWS README COPYING
-%{prefix}/bin/blam
-%{sysconfdir}/gconf/schemas/blam.schemas
-%dir %{prefix}/lib/blam
-%{prefix}/lib/blam/*
-%{prefix}/share/applications/blam.desktop
-%dir %{prefix}/share/blam
-%{prefix}/share/blam/collection.xml
-%dir %{prefix}/share/blam/images
-%{prefix}/share/blam/images/*.png
-%{prefix}/share/pixmaps/*.png
-
-%changelog -n blam
+%{_bindir}/%{name}
+%{_prefix}/lib/%{name}
+%{_datadir}/applications/%{name}.desktop
+%{_datadir}/%{name}
+%{_datadir}/pixmaps/%{name}.png
+%doc %{_mandir}/man1/%{name}.1*
+
+%changelog
+* Tue Mar 13 2007 - jhargadon@suse.de
+- update to version 1.8.4
+- specfile cleanup
+- This update resolves bug #244584
* Thu Jan 25 2007 - ro@suse.de
- GNOME moved to /usr
* Wed Dec 20 2006 - jhargadon@suse.de
++++++ blam-1.8.2.tar.bz2 -> blam-1.8.4.tar.bz2 ++++++
++++ 72417 lines of diff (skipped)
++++++ blam-bgo407385.patch ++++++
--- themes/blam/blam.css
+++ themes/blam/blam.css
@@ -0,0 +1,65 @@
+#header
+{
+ position: fixed; top: 0px;
+ width: 99%;
+ background: #333333;
+ padding: 3px;
+}
+
+#header .title
+{
+ font-size: x-large;
+ position: relative; top: 3px; left: 5px;
+ color: #ffffff;
+}
+
+#header .date
+{
+ position: absolute; top: 2px; right: 20px;
+ font-size: 10pt;
+ color: #ffffff;
+}
+
+#body
+{
+ position: absolute; top: 40px; bottom 10px; left: 2%;
+ padding: 2px;
+}
+
+#footer
+{
+ background: #333333;
+ position: fixed; bottom: 0px;
+ width: 99%;
+}
+
+#footer .link
+{
+ color: #ffff00;
+}
+
+#footer .author
+{
+ color: #aaaaaa;
+ position: absolute; right: 10px;
+}
+
+/* ---------------------------------
+ * For the old one with the tables
+#header
+{
+ background: #333333;
+ display: block;
+}
+
+#body
+{
+ padding: 2px;
+}
+
+#footer
+{
+ background: #333333;
+ position: absolute; bottom: 2px;
+}
+*/
\ Kein Zeilenumbruch am Dateiende.
--- themes/blam/theme.html
+++ themes/blam/theme.html
@@ -1,15 +1,31 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+ <link rel="stylesheet" href="blam.css" type="text/css">
<title>${title}</title>
<base href="${url}" />
</head>
<body>
- <!-- header -->
- <table bgcolor="#333333" border="0" width="100%" cellpadding="0" cellspacing="0">
+ <div id="body">
+ ${text}
+ </div>
+
+ <div id="header">
+ <span class="title">${title}</span>
+ <span class="date">${pubdate}</span>
+ </div>
+
+ <div id="footer">
+ <span class="link">${link}</span>
+ <span class="author">${author}</span>
+ </div>
+ </body>
+
+
</html>
--- themes/pimped/pimped.css
+++ themes/pimped/pimped.css
@@ -21,11 +21,18 @@
position:fixed; bottom:0px; left: 0px; width:100%;
}
+#head .icon
+{
+ min-height: 64px;
+ display: block;
+ background: url(blam.png) no-repeat;
+}
+
#head .title
{
font-size: x-large;
position:absolute; top: 25%;
- padding-left: 10px;
+ padding-left: 74px;
}
#head .date
--- themes/pimped/theme.html
+++ themes/pimped/theme.html
@@ -12,7 +12,7 @@
</div>
<div id="head">
- <span class="icon"><img src="blam.png"/></span>
+ <span class="icon"></span>
<span class="title">${title}</span>
<span class="date">${pubdate}</span>
</div>
++++++ blam-bgo417904.patch ++++++
--- themes/blam/Makefile.am
+++ themes/blam/Makefile.am
@@ -5,4 +5,5 @@
blam-box-bottom-right.png \
blam-box-pad.png \
blam-box-top-left.png \
- blam-box-top-right.png
+ blam-box-top-right.png \
+ blam.css
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org