rpms/libgnomedb/EL-5 import.log, NONE, 1.1 libgnomedb-3.0.0-64bit.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 libgnomedb.spec, 1.20, 1.21 sources, 1.3, 1.4 libgnomedb-1.2.0-desktop.patch, 1.1, NONE libgnomedb-1.9.100-64bit.patch, 1.1, NONE libgnomedb-1.9.100-sharp.patch, 1.2, NONE libgnomedb-1.9.100-unknown-datatype-fix.patch, 1.2, NONE
Lubomir Rintel
lkundrak at fedoraproject.org
Tue Sep 23 07:26:42 UTC 2008
Author: lkundrak
Update of /cvs/pkgs/rpms/libgnomedb/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv973/EL-5
Modified Files:
.cvsignore libgnomedb.spec sources
Added Files:
import.log libgnomedb-3.0.0-64bit.patch
Removed Files:
libgnomedb-1.2.0-desktop.patch libgnomedb-1.9.100-64bit.patch
libgnomedb-1.9.100-sharp.patch
libgnomedb-1.9.100-unknown-datatype-fix.patch
Log Message:
Import from devel
--- NEW FILE import.log ---
libgnomedb-3_0_0-6_fc10:EL-5:libgnomedb-3.0.0-6.fc10.src.rpm:1222154748
libgnomedb-3.0.0-64bit.patch:
--- NEW FILE libgnomedb-3.0.0-64bit.patch ---
--- libgnomedb-3.0.0/extra/demos/console.c~ 2007-05-27 21:37:35.000000000 +0200
+++ libgnomedb-3.0.0/extra/demos/console.c 2007-05-27 21:37:35.000000000 +0200
@@ -4,6 +4,7 @@
*/
#include <libgnomedb/libgnomedb.h>
+#include <libgnomedb-extra/gnome-db-sql-console.h>
extern GdaDict *demo_dict;
static GtkWidget *window = NULL;
--- libgnomedb-3.0.0/libgnomedb/gnome-db-data-source-selector.c~ 2007-05-27 21:36:12.000000000 +0200
+++ libgnomedb-3.0.0/libgnomedb/gnome-db-data-source-selector.c 2007-05-27 21:36:12.000000000 +0200
@@ -28,6 +28,7 @@
#include <libgnomedb/gnome-db-util.h>
#include <gtk/gtkcelllayout.h>
#include <gtk/gtkcellrenderer.h>
+#include <gtk/gtkcellrenderertext.h>
#define PARENT_TYPE GTK_TYPE_COMBO_BOX
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libgnomedb/EL-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 27 Nov 2005 20:31:02 -0000 1.3
+++ .cvsignore 23 Sep 2008 07:26:11 -0000 1.4
@@ -1 +1 @@
-libgnomedb-1.9.100.tar.bz2
+libgnomedb-3.0.0.tar.bz2
Index: libgnomedb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgnomedb/EL-5/libgnomedb.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- libgnomedb.spec 10 Sep 2006 05:27:51 -0000 1.20
+++ libgnomedb.spec 23 Sep 2008 07:26:11 -0000 1.21
@@ -1,25 +1,25 @@
Name: libgnomedb
Epoch: 1
-Version: 1.9.100
-Release: 11%{?dist}
+Version: 3.0.0
+Release: 6%{?dist}
Summary: Library for writing gnome database programs
Group: System Environment/Libraries
-License: LGPL
+License: LGPLv2+
URL: http://www.gnome-db.org/
-Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/1.9/%{name}-%{version}.tar.bz2
-Patch0: libgnomedb-1.2.0-desktop.patch
-Patch1: libgnomedb-1.9.100-sharp.patch
-Patch2: libgnomedb-1.9.100-unknown-datatype-fix.patch
-Patch3: libgnomedb-1.9.100-64bit.patch
+Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/3.0/%{name}-%{version}.tar.bz2
+Patch0: libgnomedb-3.0.0-64bit.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-root
BuildRequires: libgnomeui-devel libgda-devel openssl-devel
-BuildRequires: gtksourceview-devel mono-devel gtk-sharp2-devel
-BuildRequires: gnome-sharp-devel gtk-sharp2-gapi libgda-sharp gtk-doc
+BuildRequires: gtksourceview-devel
BuildRequires: gettext scrollkeeper perl(XML::Parser) desktop-file-utils
-Requires: scrollkeeper
+Requires: scrollkeeper hicolor-icon-theme
Requires(pre): GConf2
Requires(post): GConf2 /sbin/ldconfig
Requires(preun): GConf2
+Requires(postun): /sbin/ldconfig
+# note we do not provide these, they no longer exist
+Obsoletes: %{name}-sharp < %{epoch}:%{version}-%{release}
+Obsoletes: %{name}-sharp-devel < %{epoch}:%{version}-%{release}
%description
libgnomedb is a library that eases the task of writing
@@ -27,7 +27,7 @@
%package devel
-Summary: Development libraries and header files for libgnomedb.
+Summary: Development libraries and header files for libgnomedb
Group: Development/Libraries
Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: pkgconfig libgnomeui-devel libgda-devel
@@ -39,57 +39,52 @@
or compile programs that use libgda.
-%package sharp
-Summary: Mono bindings for libgnomedb
-Group: System Environment/Libraries
-Requires: %{name} = %{epoch}:%{version}-%{release}
-
-%description sharp
-This package contains the dll files needed to run (and compile) Mono
-applications which use libgnomedb.
-
-
%prep
%setup -q
-%patch0 -p1 -b .desktop.patch
-%patch1 -p1 -b .sharp
-%patch2 -p1 -b .unknown
-%patch3 -p1 -b .64bit
+%patch0 -p1 -z .64bit
%build
-%configure
+%configure --disable-static --disable-dependency-tracking --disable-gtk-doc
+# Don't use rpath!
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+# dirty hack to make building the gtkdocs work despite us disabling rpath
+export LD_LIBRARY_PATH=`pwd`/libgnomedb/.libs:`pwd`/libgnomedb/plugins/.libs:`pwd`/libgnomedb-extra/.libs:`pwd`/libgnomedb-graph/.libs
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT \
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p" \
LIBGNOMEDB_DTDDIR=%{_datadir}/libgnomedb/dtd
-%find_lang libgnomedb-3
+%find_lang libgnomedb-3.0
+# below is the desktop file and icon stuff.
desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications \
- --vendor fedora --add-category X-Fedora --delete-original \
- $RPM_BUILD_ROOT%{_datadir}/applications/database-properties.desktop
-
-# fixup mono / sharp related files install
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/gapi-2.0
-install -m 644 gnomedb-sharp/gnomedb-api.xml $RPM_BUILD_ROOT/%{_datadir}/gapi-2.0
-mkdir -p $RPM_BUILD_ROOT/usr/lib/mono/gnomedb-sharp-2.0
-mv $RPM_BUILD_ROOT/%{_libdir}/libgnomedb/gnomedb-sharp.dll* \
- $RPM_BUILD_ROOT/usr/lib/mono/gnomedb-sharp-2.0
+ --vendor fedora --remove-category Application \
+ --remove-category AdvancedSettings --delete-original \
+ --add-category X-GNOME-SystemSettings \
+ $RPM_BUILD_ROOT%{_datadir}/applications/database-properties-3.0.desktop
+
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
+mv $RPM_BUILD_ROOT%{_datadir}/pixmaps/gnome-db.png \
+ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
# remove unpackaged files
-rm -f $RPM_BUILD_ROOT/%{_libdir}/*.{a,la}
-rm -f $RPM_BUILD_ROOT/%{_libdir}/libgnomedb/plugins/*.{a,la}
-rm -f $RPM_BUILD_ROOT/%{_libdir}/libglade/2.0/*.{a,la}
+rm $RPM_BUILD_ROOT/%{_libdir}/*.la
+rm $RPM_BUILD_ROOT/%{_libdir}/libgnomedb/plugins/*.la
+rm $RPM_BUILD_ROOT/%{_libdir}/libglade/2.0/*.la
+
+# put the demo in -devel %%doc
+mv $RPM_BUILD_ROOT/%{_datadir}/gnome-db/demo .
%pre
if [ "$1" -gt 1 ]; then
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-uninstall-rule \
- %{_sysconfdir}/gconf/schemas/libgnomedb.schemas >/dev/null || :
+ %{_sysconfdir}/gconf/schemas/libgnomedb-3.0.schemas >/dev/null || :
fi
@@ -97,18 +92,27 @@
/sbin/ldconfig
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-install-rule \
- %{_sysconfdir}/gconf/schemas/libgnomedb.schemas > /dev/null || :
+ %{_sysconfdir}/gconf/schemas/libgnomedb-3.0.schemas > /dev/null || :
+touch --no-create %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+ %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
%preun
if [ "$1" -eq 0 ]; then
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-uninstall-rule \
- %{_sysconfdir}/gconf/schemas/libgnomedb.schemas > /dev/null || :
+ %{_sysconfdir}/gconf/schemas/libgnomedb-3.0.schemas > /dev/null || :
fi
-%postun -p /sbin/ldconfig
+%postun
+/sbin/ldconfig
+touch --no-create %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+ %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
%post devel
@@ -123,14 +127,14 @@
rm -rf $RPM_BUILD_ROOT
-%files -f libgnomedb-3.lang
-%defattr(-,root,root)
-%doc AUTHORS COPYING ChangeLog README NEWS
+%files -f libgnomedb-3.0.lang
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING ChangeLog NEWS
%{_bindir}/*
-%{_datadir}/mime-info/*
-%{_datadir}/pixmaps/libgnomedb
-%{_datadir}/applications/*.desktop
-%{_datadir}/libgnomedb
+%{_datadir}/pixmaps/libgnomedb-3.0
+%{_datadir}/applications/fedora-database-properties-3.0.desktop
+%{_datadir}/icons/hicolor/48x48/apps/gnome-db.png
+%{_datadir}/gnome-db
%{_libdir}/*.so.*
%dir %{_libdir}/libgnomedb
%{_libdir}/libgnomedb/plugins
@@ -138,21 +142,51 @@
%config(noreplace) %{_sysconfdir}/gconf/schemas/*
%files devel
-%defattr(-,root,root)
-%{_includedir}/libgnomedb-1.9
+%defattr(-,root,root,-)
+%doc demo
+%{_includedir}/libgnomedb-3.0
%{_libdir}/*.so
-%{_libdir}/pkgconfig/libgnomedb-2.0.pc
+%{_libdir}/pkgconfig/libgnomedb-3.0.pc
+%{_libdir}/pkgconfig/libgnomedb-extra-3.0.pc
+%{_libdir}/pkgconfig/libgnomedb-graph-3.0.pc
%{_datadir}/omf/%{name}
-%{_datadir}/gtk-doc/html/libgnomedb
-
-%files sharp
-%defattr(-,root,root)
-%{_datadir}/gapi-2.0
-/usr/lib/mono/gnomedb-sharp-2.0
-%{_libdir}/pkgconfig/gnomedb-sharp-2.0.pc
+%{_datadir}/gtk-doc/html/libgnomedb-3.0
%changelog
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1:3.0.0-6
+- Autorebuild for GCC 4.3
+
+* Thu Dec 6 2007 Jeremy Katz <katzj at redhat.com> - 1:3.0.0-5
+- rebuild for new openssl
+
+* Mon Aug 13 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1:3.0.0-4
+- Don't rebuild the documentation to avoid multilib conflicts (bz 342141)
+
+* Mon Aug 13 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1:3.0.0-3
+- Update License tag for new Licensing Guidelines compliance
+
+* Fri Jun 29 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1:3.0.0-2
+- Rebuild for new gtksourceview (bz 246202)
+
+* Sun May 27 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1:3.0.0-1
+- New upstream release 3.0.0
+- Remove mono bindings sub-package as upstream no longer includes them
+
+* Thu May 10 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.9.100-15
+- Don't build mono/sharp bits on ppc64
+
+* Mon Apr 30 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.9.100-14
+- Fix closing of the about dialog (bz 238404)
+
+* Tue Mar 27 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.9.100-13
+- Fix categories in fedora-database-properties.desktop file (bz 234164)
+- Fixup packaging of sharp bindings to match the mono packaging guidelines
+
+* Thu Jan 11 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.9.100-12
+- Install icon under /usr/share/icons and don't reference it with an
+ absolute path (bz 221101)
+
* Sun Sep 10 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.9.100-11
- Don't own /usr/share/omf (bug 205669)
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libgnomedb/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 27 Nov 2005 20:31:02 -0000 1.3
+++ sources 23 Sep 2008 07:26:11 -0000 1.4
@@ -1 +1 @@
-a98ac52f084b1b0abad6b2c53ec034cc libgnomedb-1.9.100.tar.bz2
+2a41abd14b123f0c9d4f540b9c07bedd libgnomedb-3.0.0.tar.bz2
--- libgnomedb-1.2.0-desktop.patch DELETED ---
--- libgnomedb-1.9.100-64bit.patch DELETED ---
--- libgnomedb-1.9.100-sharp.patch DELETED ---
--- libgnomedb-1.9.100-unknown-datatype-fix.patch DELETED ---
More information about the fedora-extras-commits
mailing list