[svn] r5849 - in trunk/rpms: gparted gwenview libnxml mathomatic

[packagers at lists.rpmforge.net]

Author: dries
Date: 2007-09-19 16:35:11 +0200 (Wed, 19 Sep 2007)
New Revision: 5849

Modified:
   trunk/rpms/gparted/gparted.spec
   trunk/rpms/gwenview/gwenview.spec
   trunk/rpms/libnxml/libnxml.spec
   trunk/rpms/mathomatic/mathomatic.spec
Log:
updates + gparted fix

Modified: trunk/rpms/gparted/gparted.spec
===================================================================
--- trunk/rpms/gparted/gparted.spec	2007-09-16 18:52:49 UTC (rev 5848)
+++ trunk/rpms/gparted/gparted.spec	2007-09-19 14:35:11 UTC (rev 5849)
@@ -1,10 +1,23 @@
 # $Id$
 # Authority: dag
 
+%{?dist: %{expand: %%define %dist 1}}
+
+%{?el5:%define _without_hallock 1}
+%{?el4:%define _without_hallock 1}
+%{?el3:%define _without_hallock 1}
+%{?el2:%define _without_hallock 1}
+%{?fc6:%define _without_hallock 1}
+%{?fc5:%define _without_hallock 1}
+%{?fc4:%define _without_hallock 1}
+%{?fc3:%define _without_hallock 1}
+%{?fc2:%define _without_hallock 1}
+%{?fc1:%define _without_hallock 1}
+
 Summary: Gnome Partition Editor
 Name: gparted
 Version: 0.3.3
-Release: 1
+Release: 2
 License: GPL
 Group: Applications/System
 URL: http://gparted.sourceforge.net/
@@ -20,8 +33,9 @@
 BuildRequires: gtkmm24-devel, parted-devel 
 BuildRequires: e2fsprogs-devel, gettext perl(XML::Parser) 
 BuildRequires: desktop-file-utils
-Requires: hal >= 0.5.9
 
+%{!?_without_hallock:Requires: hal >= 0.5.9}
+
 %description
 GParted stands for Gnome Partition Editor and is a graphical frontend to
 libparted. Among other features it supports creating, resizing, moving
@@ -34,10 +48,16 @@
 %patch0 -p0 -b .hal
 %patch1 -p0 -b .devs
 
+%if %{?_without_hallock:1}0
 %{__cat} <<EOF >run-gparted
+%{_sbindir}/gparted
+EOF
+%else
+%{__cat} <<EOF >run-gparted
 #!/bin/bash
-%{_bindir}/hal-lock --interface org.freedesktop.Hal.Device.Storage  --exclusive --run %{_sbindir}/usr/sbin/gparted
+%{_bindir}/hal-lock --interface org.freedesktop.Hal.Device.Storage  --exclusive --run %{_sbindir}/gparted
 EOF
+%endif
 
 %{__cat} <<EOF >gparted.pam
 #%PAM-1.0
@@ -97,6 +117,9 @@
 %{_sbindir}/gparted
 
 %changelog
+* Wed Sep 19 2007 Dries Verachtert <dries at ulyssis.org> - 0.3.3-2
+- Only use hal-lock on recent distributions.
+
 * Thu Jun 28 2007 Dag Wieers <dag at wieers.com> - 0.3.3-1
 - Added Fedora patches.
 - Initial package. (using DAR)

Modified: trunk/rpms/gwenview/gwenview.spec
===================================================================
--- trunk/rpms/gwenview/gwenview.spec	2007-09-16 18:52:49 UTC (rev 5848)
+++ trunk/rpms/gwenview/gwenview.spec	2007-09-19 14:35:11 UTC (rev 5849)
@@ -10,7 +10,7 @@
 
 Summary: Image viewer for KDE
 Name: gwenview
-Version: 1.4.1
+Version: 1.4.2
 Release: 1
 License: GPL
 Group: Amusements/Graphics
@@ -51,7 +51,7 @@
 %files
 # -f %{name}.lang
 %defattr(-, root, root, 0755)
-%doc AUTHORS COPYING NEWS README TODO
+%doc AUTHORS COPYING NEWS README
 %{_bindir}/gwenview
 %{_libdir}/kde3/libgv*
 %{_libdir}/kde3/gwenview.*
@@ -72,6 +72,9 @@
 %{_datadir}/config.kcfg/*.kcfg
 
 %changelog
+* Wed Sep 19 2007 Dries Verachtert <dries at ulyssis.org> - 1.4.2-1
+- Updated to release 1.4.2.
+
 * Mon Nov 27 2006 Dries Verachtert <dries at ulyssis.org> - 1.4.1-1
 - Updated to release 1.4.1.
 

Modified: trunk/rpms/libnxml/libnxml.spec
===================================================================
--- trunk/rpms/libnxml/libnxml.spec	2007-09-16 18:52:49 UTC (rev 5848)
+++ trunk/rpms/libnxml/libnxml.spec	2007-09-19 14:35:11 UTC (rev 5849)
@@ -4,7 +4,7 @@
 
 Summary: Library for parsing, writing and creating XML
 Name: libnxml
-Version: 0.18.0
+Version: 0.18.1
 Release: 1
 License: GPL
 Group: Development/Libraries
@@ -61,6 +61,9 @@
 %exclude %{_libdir}/libnxml.la
 
 %changelog
+* Wed Sep 19 2007 Dries Verachtert <dries at ulyssis.org> - 0.18.1-1
+- Updated to release 0.18.1.
+
 * Fri Jul 06 2007 Dag Wieers <dag at wieers.com> - 0.18.0-1
 - Updated to release 0.18.0.
 

Modified: trunk/rpms/mathomatic/mathomatic.spec
===================================================================
--- trunk/rpms/mathomatic/mathomatic.spec	2007-09-16 18:52:49 UTC (rev 5848)
+++ trunk/rpms/mathomatic/mathomatic.spec	2007-09-19 14:35:11 UTC (rev 5849)
@@ -9,7 +9,7 @@
 Release: 1
 License: LGPL
 Group: Applications/Engineering
-URL: http://www.mathomatic.com/
+URL: http://www.mathomatic.org/
 
 Source: http://www.panix.com/~gesslein/mathomatic-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root