try to make it build
This commit is contained in:
parent
1fb0be4f73
commit
40ea37ec11
10
gtk2.spec
10
gtk2.spec
@ -16,7 +16,7 @@
|
|||||||
Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
|
Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
|
||||||
Name: gtk2
|
Name: gtk2
|
||||||
Version: %{base_version}
|
Version: %{base_version}
|
||||||
Release: 3%{?dist}
|
Release: 4%{?dist}
|
||||||
License: LGPLv2+
|
License: LGPLv2+
|
||||||
Group: System Environment/Libraries
|
Group: System Environment/Libraries
|
||||||
Source: http://download.gnome.org/sources/gtk+/2.12/gtk+-%{version}.tar.bz2
|
Source: http://download.gnome.org/sources/gtk+/2.12/gtk+-%{version}.tar.bz2
|
||||||
@ -40,6 +40,9 @@ Patch4: tab-label.patch
|
|||||||
# backport from svn trunk
|
# backport from svn trunk
|
||||||
Patch5: im-setting.patch
|
Patch5: im-setting.patch
|
||||||
|
|
||||||
|
# fix a gtk-doc issue
|
||||||
|
Patch6: gtkdoc-rebase.patch
|
||||||
|
|
||||||
BuildRequires: atk-devel >= %{atk_version}
|
BuildRequires: atk-devel >= %{atk_version}
|
||||||
BuildRequires: pango-devel >= %{pango_version}
|
BuildRequires: pango-devel >= %{pango_version}
|
||||||
BuildRequires: glib2-devel >= %{glib2_version}
|
BuildRequires: glib2-devel >= %{glib2_version}
|
||||||
@ -119,6 +122,7 @@ docs for the GTK+ widget toolkit.
|
|||||||
%patch3 -p1 -b .system-log-crash
|
%patch3 -p1 -b .system-log-crash
|
||||||
%patch4 -p1 -b .tab-label
|
%patch4 -p1 -b .tab-label
|
||||||
%patch5 -p1 -b .im-setting
|
%patch5 -p1 -b .im-setting
|
||||||
|
%patch6 -p1 -b .gtkdoc-rebase
|
||||||
|
|
||||||
for i in config.guess config.sub ; do
|
for i in config.guess config.sub ; do
|
||||||
test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i .
|
test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i .
|
||||||
@ -154,7 +158,6 @@ gcc -Os relocation-tag.c -o .relocation-tag
|
|||||||
|
|
||||||
%install
|
%install
|
||||||
rm -rf $RPM_BUILD_ROOT
|
rm -rf $RPM_BUILD_ROOT
|
||||||
|
|
||||||
# Deriving /etc/gtk-2.0/$host location
|
# Deriving /etc/gtk-2.0/$host location
|
||||||
# NOTE: Duplicated below
|
# NOTE: Duplicated below
|
||||||
#
|
#
|
||||||
@ -302,6 +305,9 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%{_datadir}/gtk-2.0
|
%{_datadir}/gtk-2.0
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Dec 18 2007 Matthias Clasen <mclasen@redhat.com> - 2.12.3-4
|
||||||
|
- Fix a gtk-doc problem
|
||||||
|
|
||||||
* Mon Dec 17 2007 Matthias Clasen <mclasen@redhat.com> - 2.12.3-3
|
* Mon Dec 17 2007 Matthias Clasen <mclasen@redhat.com> - 2.12.3-3
|
||||||
- Add a setting to change input methods
|
- Add a setting to change input methods
|
||||||
|
|
||||||
|
15
gtkdoc-rebase.patch
Normal file
15
gtkdoc-rebase.patch
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
diff -up gtk+-2.12.3/gtk-doc.make.rebase gtk+-2.12.3/gtk-doc.make
|
||||||
|
--- gtk+-2.12.3/gtk-doc.make.rebase 2007-12-18 12:09:09.000000000 -0500
|
||||||
|
+++ gtk+-2.12.3/gtk-doc.make 2007-12-18 12:11:22.000000000 -0500
|
||||||
|
@@ -139,9 +139,8 @@ install-data-local:
|
||||||
|
done; \
|
||||||
|
echo '-- Installing $(srcdir)/html/index.sgml' ; \
|
||||||
|
$(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \
|
||||||
|
- if test "`which gtkdoc-rebase`" != ""; then \
|
||||||
|
- gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \
|
||||||
|
- fi \
|
||||||
|
+ which gtkdoc-rebase > /dev/null && \
|
||||||
|
+ gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user