Author: goetz
Date: Tue Feb 13 12:40:46 2007
New Revision: 120340
Added:
packages/cooker/gnome-db2.0/current/SOURCES/libgnomedb-2.99.5-glade3.patch
packages/cooker/gnome-db2.0/current/SOURCES/libgnomedb-2.99.5.tar.bz2
(contents, props changed)
Removed:
packages/cooker/gnome-db2.0/current/SOURCES/libgnomedb-2.99.3.tar.bz2
Modified:
packages/cooker/gnome-db2.0/current/SPECS/gnome-db2.0.spec
Log:
- new version
- bump deps
- fix file list
- fix build with glade3
Added:
packages/cooker/gnome-db2.0/current/SOURCES/libgnomedb-2.99.5-glade3.patch
==============================================================================
--- (empty file)
+++ packages/cooker/gnome-db2.0/current/SOURCES/libgnomedb-2.99.5-glade3.patch
Tue Feb 13 12:40:46 2007
@@ -0,0 +1,34 @@
+--- libgnomedb-2.99.5/configure.in~ 2007-02-12 16:40:03.000000000 +0100
++++ libgnomedb-2.99.5/configure.in 2007-02-13 12:17:08.000000000 +0100
+@@ -213,16 +213,16 @@
+ # Note that glade 3.0 used glade-3 for its pkg-config module name,
+ # But glade 3.1/3.2 uses gladeui-1.0.
+ # We decided to use the latest glade version, if any.
+-GLADE3_MODULES="gladeui-1.0 >= 3.1"
++GLADE3_MODULES="libgladeui-1.0 >= 3.1"
+
+ PKG_CHECK_MODULES(GLADE3, $GLADE3_MODULES, have_glade3=yes, have_glade3=no)
+ AM_CONDITIONAL(HAVE_GLADE3, test x"$have_glade3" = "xyes")
+
+ if test x"$have_glade3" = "xyes"
+ then
+- GLADE3_PIXMAP_DIR=`pkg-config --variable=pixmapdir gladeui-1.0`
+- GLADE3_MODULES_DIR=`pkg-config --variable=moduledir gladeui-1.0`
+- GLADE3_CATALOG_DIR=`pkg-config --variable=catalogdir gladeui-1.0`
++ GLADE3_PIXMAP_DIR=`pkg-config --variable=pixmapdir libgladeui-1.0`
++ GLADE3_MODULES_DIR=`pkg-config --variable=moduledir libgladeui-1.0`
++ GLADE3_CATALOG_DIR=`pkg-config --variable=catalogdir libgladeui-1.0`
+ AC_SUBST(GLADE3_PIXMAP_DIR)
+ AC_SUBST(GLADE3_MODULES_DIR)
+ AC_SUBST(GLADE3_CATALOG_DIR)
+--- libgnomedb-2.99.5/glade3/glade3-gnomedb.c~ 2007-01-28 13:31:50.000000000
+0100
++++ libgnomedb-2.99.5/glade3/glade3-gnomedb.c 2007-02-13 12:23:49.000000000
+0100
+@@ -19,7 +19,7 @@
+ * Authors:
+ * Daniel Espinosa Ortiz <[EMAIL PROTECTED]>
+ */
+-#include <gladeui/glade.h>
++#include <glade.h>
+ #include <libgnomedb/libgnomedb.h>
+
+ #ifdef G_OS_WIN32
Added: packages/cooker/gnome-db2.0/current/SOURCES/libgnomedb-2.99.5.tar.bz2
==============================================================================
Binary file. No diff available.
Modified: packages/cooker/gnome-db2.0/current/SPECS/gnome-db2.0.spec
==============================================================================
--- packages/cooker/gnome-db2.0/current/SPECS/gnome-db2.0.spec (original)
+++ packages/cooker/gnome-db2.0/current/SPECS/gnome-db2.0.spec Tue Feb 13
12:40:46 2007
@@ -4,18 +4,19 @@
%define oname gnome-db
%define api 3
%define libname %mklibname %{oname}%{api}_ %major
-%define gdaver 2.99.3
+%define gdaver 2.99.4
%define build_mono 1
%{?_with_mdb: %global build_mono 1}
Summary: GNOME DB
Name: %name
-Version: 2.99.3
+Version: 2.99.5
Release: %mkrel 1
License: GPL/LGPL
Group: Databases
URL: http://www.gnome-db.org/
Source0:
ftp://ftp.gnome.org/pub/GNOME/sources/%{pkgname}/%{pkgname}-%{version}.tar.bz2
+Patch: libgnomedb-2.99.5-glade3.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-root
BuildRequires: libgnomeui2-devel
BuildRequires: gda2.0-devel >= %gdaver
@@ -93,6 +94,8 @@
%prep
%setup -q -n %{pkgname}-%{version}
+%patch -p1
+autoconf
%build
%configure2_5x
@@ -111,15 +114,13 @@
# menu entry
mkdir -p $RPM_BUILD_ROOT%{_menudir}
cat << EOF > $RPM_BUILD_ROOT%{_menudir}/%{name}
-?package(%{name}):command="%{_bindir}/gnome-database-properties" \
+?package(%{name}):command="%{_bindir}/gnome-database-properties-3.0" \
icon="gnome-db2.png" \
needs="x11" section="More Applications/Databases" \
title="GNOME Database configuration" \
longtitle="Configure your database environment" \
startup_notify="true" xdg="true"
EOF
-#gw work around broken desktop file
-perl -pi -e "s�^_��" $RPM_BUILD_ROOT%{_datadir}/applications/*
desktop-file-install --vendor="" \
--remove-category="Application" \
--remove-category="AdvancedSettings" \
@@ -145,10 +146,10 @@
%post
%{update_menus}
-%post_install_gconf_schemas libgnomedb
+%post_install_gconf_schemas libgnomedb-3.0
%preun
-%preun_uninstall_gconf_schemas libgnomedb
+%preun_uninstall_gconf_schemas libgnomedb-3.0
%postun
%{clean_menus}
@@ -166,16 +167,15 @@
%files -f %{pkgname}-%api.lang
%defattr(-, root, root)
%doc AUTHORS COPYING ChangeLog NEWS
+%_sysconfdir/gconf/schemas/libgnomedb-3.0.schemas
%{_bindir}/*
-%{_sysconfdir}/gconf/schemas/libgnomedb.schemas
-%{_datadir}/mime-info/*
%{_datadir}/pixmaps/*
%_libdir/glade3/modules/libgladegnomedb.so
%_datadir/glade3/
%dir %_datadir/gnome-db/
%_datadir/gnome-db/*.xml
%_datadir/gnome-db/*.glade
-%_datadir/applications/database-properties.desktop
+%_datadir/applications/database-properties-3.0.desktop
%{_libdir}/libglade/2.0/*
%dir %{_libdir}/libgnomedb/
%{_libdir}/libgnomedb/plugins/
@@ -196,6 +196,6 @@
%{_libdir}/*.a
%{_libdir}/pkgconfig/*
%{_includedir}/*
-%dir %{_datadir}/omf/libgnomedb
-%{_datadir}/omf/libgnomedb/libgnomedb-C.omf
+%dir %{_datadir}/omf/*
+%{_datadir}/omf/*/*-C.omf
%_datadir/gnome-db/demo
