rpms/libgdl/F-7 libgdl-0.7.10-pkgconfig.patch, NONE, 1.1 libgdl.spec, 1.4, 1.5 libgdl-0.7.8-pkgconfig.patch, 1.1, NONE
Debarshi Ray (rishi)
fedora-extras-commits at redhat.com
Sun Mar 2 19:55:12 UTC 2008
Author: rishi
Update of /cvs/pkgs/rpms/libgdl/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1870
Modified Files:
libgdl.spec
Added Files:
libgdl-0.7.10-pkgconfig.patch
Removed Files:
libgdl-0.7.8-pkgconfig.patch
Log Message:
Updated to 0.7.10-1 in F-7.
Modified Files:
libgdl.spec
Added Files:
libgdl-0.7.10-pkgconfig.patch
Removed Files:
libgdl-0.7.8-pkgconfig.patch
libgdl-0.7.10-pkgconfig.patch:
--- NEW FILE libgdl-0.7.10-pkgconfig.patch ---
diff -urNp gdl-0.7.10.orig/gdl-1.0.pc.in gdl-0.7.10/gdl-1.0.pc.in
--- gdl-0.7.10.orig/gdl-1.0.pc.in 2007-05-07 18:40:12.000000000 +0530
+++ gdl-0.7.10/gdl-1.0.pc.in 2008-03-02 20:48:50.000000000 +0530
@@ -7,6 +7,6 @@ idldir=@datadir@/idl/libgdl-1.0
Name: gdl
Description: Gnome DevTool Libraries
Version: @VERSION@
-Requires: gtk+-2.0 libxml-2.0 libglade-2.0
+Requires: gtk+-2.0
Libs: -L${libdir} -lgdl-1
Cflags: -I${includedir}
diff -urNp gdl-0.7.10.orig/gdl-gnome-1.0.pc.in gdl-0.7.10/gdl-gnome-1.0.pc.in
--- gdl-0.7.10.orig/gdl-gnome-1.0.pc.in 2007-05-07 18:40:12.000000000 +0530
+++ gdl-0.7.10/gdl-gnome-1.0.pc.in 2008-03-02 20:48:50.000000000 +0530
@@ -7,6 +7,6 @@ idldir=@datadir@/idl/libgdl-1.0
Name: gdl-gnome
Description: Gnome DevTool Libraries - Gnome part
Version: @VERSION@
-Requires: libgnomeui-2.0 gnome-vfs-2.0 gtk+-2.0 gdl-1.0
+Requires: gtk+-2.0 gdl-1.0
Libs: -L${libdir} -lgdl-gnome-1
Cflags: -I${includedir}
Index: libgdl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgdl/F-7/libgdl.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libgdl.spec 2 Feb 2008 20:43:32 -0000 1.4
+++ libgdl.spec 2 Mar 2008 19:54:35 -0000 1.5
@@ -1,7 +1,7 @@
Summary: Components and library for GNOME development tools
Name: libgdl
-Version: 0.7.8
-Release: 2%{?dist}
+Version: 0.7.10
+Release: 1%{?dist}
# Mixed source licensing scenario.
License: (GPLv2 and GPLv2+ and LGPLv2+)
Group: Development/Libraries
@@ -16,10 +16,14 @@
Provides: anjuta-gdl = %{version}-%{release}
Obsoletes: anjuta-gdl < 0.7.7-1
-BuildRequires: chrpath
+%if 0%{?fc7}
+BuildRequires: gtk-doc
+%endif
+
BuildRequires: gettext
BuildRequires: intltool
BuildRequires: libgnomeui-devel
+BuildRequires: libtool
BuildRequires: perl(XML::Parser)
%description
@@ -41,6 +45,7 @@
Provides: anjuta-gdl-devel = %{version}-%{release}
Obsoletes: anjuta-gdl-devel < 0.7.7-1
+Requires: gtk-doc
Requires: gtk2-devel
Requires: %{name} = %{version}-%{release}
Requires: pkgconfig
@@ -53,7 +58,11 @@
%patch0 -p1
%build
-%configure --disable-static
+%configure --disable-static --enable-gtk-doc
+
+# Fix Libtool to remove rpaths.
+rm -f ./libtool
+cp %{_bindir}/libtool .
# Omit unused direct shared library dependencies.
sed --in-place --expression 's! -shared ! -Wl,--as-needed\0!g' libtool
@@ -65,12 +74,10 @@
make install INSTALL="%{__install} -p" DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name "*.la" -delete
+find $RPM_BUILD_ROOT -type f -name "*.a" -delete
%find_lang gdl-1
-# Remove rpaths.
-chrpath --delete $RPM_BUILD_ROOT%{_libdir}/%{name}-gnome-1.so.0.0.0
-
%clean
rm -rf $RPM_BUILD_ROOT
@@ -99,10 +106,20 @@
%{_libdir}/pkgconfig/gdl-1.0.pc
%{_libdir}/pkgconfig/gdl-gnome-1.0.pc
+%dir %{_datadir}/gtk-doc/html/gdl
+%{_datadir}/gtk-doc/html/gdl/*
+
%dir %{_includedir}/%{name}-1.0
%{_includedir}/%{name}-1.0/gdl
%changelog
+* Sun Mar 02 2008 Debarshi Ray <rishi at fedoraproject.org> - 0.7.10-1
+- Version bump to 0.7.10.
+- Added 'BuildRequires: gtk-doc' on Fedora 7.
+- Added 'Requires: gtk-doc' for libgdl-devel.
+- Replaced 'BuildRequires: chrpath' with 'BuildRequires: libtool' for removing
+ rpaths.
+
* Sun Feb 03 2008 Debarshi Ray <rishi at fedoraproject.org> - 0.7.8-2
- Omitted unused direct shared library dependencies.
--- libgdl-0.7.8-pkgconfig.patch DELETED ---
More information about the fedora-extras-commits
mailing list