[libgda] fix gobject introspection support spec cleanup (old obsoletes have been removed)
Haïkel Guémar
hguemar at fedoraproject.org
Sun Jan 22 18:52:57 UTC 2012
commit 7c1387b26aeb7e71ed6ea5062be8716ea1500a02
Author: Haïkel Guémar <hguemar at fedoraproject.org>
Date: Sun Jan 22 19:52:40 2012 +0100
fix gobject introspection support
spec cleanup (old obsoletes have been removed)
libgda.spec | 57 +++++++++++++++++++++------------------------------------
1 files changed, 21 insertions(+), 36 deletions(-)
---
diff --git a/libgda.spec b/libgda.spec
index b9a29ac..ac306c6 100644
--- a/libgda.spec
+++ b/libgda.spec
@@ -20,7 +20,7 @@
Name: libgda
Epoch: 1
Version: 4.2.12
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Library for writing gnome database programs
Group: System Environment/Libraries
License: LGPLv2+
@@ -50,19 +50,6 @@ BuildRequires: java-1.6.0-openjdk >= 1.6.0.0
BuildRequires: gnome-doc-utils
BuildRequires: db4-devel
BuildRequires: openldap-devel
-# note we do not provide these, they no longer exist
-Obsoletes: %{name}-sharp < %{epoch}:%{version}-%{release}
-Obsoletes: %{name}-sharp-devel < %{epoch}:%{version}-%{release}
-
-Obsoletes: %{name}-freetds < %{epoch}:3.99.0
-Obsoletes: %{name}-freetds-devel < %{epoch}:3.99.0
-Obsoletes: %{name}-ldap < %{epoch}:3.99.0
-Obsoletes: %{name}-ldap-devel < %{epoch}:3.99.0
-Obsoletes: %{name}-odbc < %{epoch}:3.99.0
-Obsoletes: %{name}-odbc-devel < %{epoch}:3.99.0
-Obsoletes: %{name}-xbase < %{epoch}:3.99.0
-Obsoletes: %{name}-xbase-devel < %{epoch}:3.99.0
-
%if %{MYSQL}
BuildRequires: mysql-devel
@@ -129,7 +116,6 @@ Summary: SQLite provider for libgda
Group: System Environment/Libraries
Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: sqlite%{?_isa} >= 3.6.O
-Obsoletes: gda-sqlite < %{epoch}:%{version}-%{release}
Provides: gda-sqlite = %{epoch}:%{version}-%{release}
%description sqlite
This package includes the libgda SQLite provider.
@@ -160,7 +146,6 @@ This package includes the pkgconfig file for the libgda ldap provider.
Summary: SQLite provider for libgda
Group: System Environment/Libraries
Requires: %{name} = %{epoch}:%{version}-%{release}
-Obsoletes: gda-sqlite < %{epoch}:%{version}-%{release}
Provides: gda-sqlite = %{epoch}:%{version}-%{release}
%description sqlcipher
This package includes the libgda SQLCipher provider.
@@ -193,7 +178,6 @@ This package includes the pkgconfig file for the libgda web provider.
Summary: MySQL provider for libgda
Group: System Environment/Libraries
Requires: %{name} = %{epoch}:%{version}-%{release}
-Obsoletes: gda-mysql < %{epoch}:%{version}-%{release}
Provides: gda-mysql = %{epoch}:%{version}-%{release}
%description mysql
This package includes the libgda MySQL provider.
@@ -212,7 +196,6 @@ This package includes the pkgconfig file for the libgda MySQL provider.
Summary: PostgreSQL provider for libgda
Group: System Environment/Libraries
Requires: %{name} = %{epoch}:%{version}-%{release}
-Obsoletes: gda-postgres < %{epoch}:%{version}-%{release}
Provides: gda-postgres = %{epoch}:%{version}-%{release}
%description postgres
This package includes the libgda PostgreSQL provider.
@@ -231,7 +214,6 @@ This package includes the pkgconfig file for the libgda PostgreSQL provider.
Summary: MDB provider for libgda
Group: System Environment/Libraries
Requires: %{name} = %{epoch}:%{version}-%{release}
-Obsoletes: gda-mdb < %{epoch}:%{version}-%{release}
Provides: gda-mdb = %{epoch}:%{version}-%{release}
%description mdb
This package includes the libgda MDB provider.
@@ -264,6 +246,10 @@ This package includes the pkgconfig file for the libgda Java JDBC provider.
%prep
%setup -q
+# fix encoding of AUTHORS
+iconv --from=ISO-8859-1 --to=UTF-8 AUTHORS > AUTHORS.new && \
+touch -r AUTHORS AUTHORS.new && \
+mv AUTHORS.new AUTHORS
%patch1 -p1 -b .man
%patch2 -p1 -b .lib64
%patch3 -p1 -b .sqlite3
@@ -274,7 +260,7 @@ This package includes the pkgconfig file for the libgda Java JDBC provider.
%build
CONFIG="--disable-static --disable-dependency-tracking --enable-system-sqlite --with-libsoup \
---enable-gtk-doc --enable-introspection=no \
+--enable-gtk-doc --enable-introspection=yes \
--with-bdb=%{_prefix} --with-bdb-libdir-name=%{_lib}"
%if %{MYSQL}
@@ -302,22 +288,18 @@ CONFIG="$CONFIG --without-java"
%endif
%configure $CONFIG
-# 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
-# workaround to fix linking failure for GI
-export LD_LIBRARY_PATH=`pwd`/libgda/.libs:`pwd`/libgda-report/.libs:`pwd`/libgda-ui/.libs
+export LD_LIBRARY_PATH=`pwd`/libgda/.libs:`pwd`/libgda-report/.libs:`pwd`/libgda-ui/.libs:$LD_LIBRARY_PATH
make %{?_smp_mflags}
%install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot}
# libgda/libgda.h is not installed ?
-mv %{name}/%{name}.h $RPM_BUILD_ROOT/%{_includedir}/%{name}-4.0/%{name}/%{name}.h
+mv %{name}/%{name}.h %{buildroot}/%{_includedir}/%{name}-4.0/%{name}/%{name}.h
# Cleanup unnecessary, unpackaged files
-find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
-rm $RPM_BUILD_ROOT/%{_sysconfdir}/libgda-4.0/sales_test.db
+find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
+rm %{buildroot}/%{_sysconfdir}/libgda-4.0/sales_test.db
%find_lang libgda-4.0
@@ -336,7 +318,7 @@ if which scrollkeeper-update >/dev/null 2>&1; then scrollkeeper-update; fi
%clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
%files -f libgda-4.0.lang
@@ -346,7 +328,6 @@ rm -rf $RPM_BUILD_ROOT
%{_bindir}/gda-list-*-4.0
%{_bindir}/gda-sql-4.0
%{_bindir}/gda-test-connection-4.0
-#%{_bindir}/gda_trml2*
%{_bindir}/gda-list-config
%{_bindir}/gda-list-server-op
%{_bindir}/gda-sql
@@ -365,7 +346,7 @@ rm -rf $RPM_BUILD_ROOT
# needs to have atleast one provider present to be of any use.
%{_libdir}/libgda-4.0/providers/libgda-bdb.so
%{_datadir}/%{name}-4.0/bdb_specs*.xml
-#%{_libdir}/girepository-1.0/Gda-4.0.typelib
+%{_libdir}/girepository-1.0/Gda-4.0.typelib
%{_mandir}/man1/*
%files devel
@@ -381,7 +362,7 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/pkgconfig/libgda-bdb-4.0.pc
%{_libdir}/pkgconfig/libgda-report-4.0.pc
%{_libdir}/pkgconfig/libgda-xslt-4.0.pc
-#%{_datadir}/gir-1.0/Gda-4.0.gir
+%{_datadir}/gir-1.0/Gda-4.0.gir
%files ui
%defattr(-,root,root,-)
@@ -392,7 +373,7 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/libgda-4.0/dtd/gdaui-layout.dtd
%{_datadir}/%{name}-4.0/server_operation.glade
%{_datadir}/%{name}-4.0/ui/gdaui-*.xml
-#%{_libdir}/girepository-1.0/Gdaui-4.0.typelib
+%{_libdir}/girepository-1.0/Gdaui-4.0.typelib
%{_datadir}/%{name}-4.0/pixmaps/gdaui-generic.png
%files ui-devel
@@ -404,7 +385,7 @@ rm -rf $RPM_BUILD_ROOT
# most of samples here requires libgda-ui
%{_datadir}/%{name}-4.0/demo/*
%{_datadir}/%{name}-4.0/pixmaps/bin-attachment-16x16.png
-#%{_datadir}/gir-1.0/Gdaui-4.0.gir
+%{_datadir}/gir-1.0/Gdaui-4.0.gir
%files tools
%defattr(-,root,root,-)
@@ -505,6 +486,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Sun Jan 22 2012 Haïkel Guémar <hguemar at fedoraproject.org> - 1:4.2.12-2
+- fix gobject-introspection support
+- clean up spec (removed old obsoletes)
+
* Sun Jan 22 2012 Haïkel Guémar <hguemar at fedoraproject.org> - 1:4.2.12-1
- upstream 4.2.12
More information about the scm-commits
mailing list