[glade/f19] fix the build
Matthias Clasen
mclasen at fedoraproject.org
Wed Jun 26 19:06:44 UTC 2013
commit 007fa1c1c911b52aefe011abd36730e6d13dd4da
Author: Matthias Clasen <mclasen at redhat.com>
Date: Wed Jun 26 15:06:29 2013 -0400
fix the build
0001-Add-man-pages.patch | 27 ++++++++++++++++++++-------
glade.spec | 6 +++++-
2 files changed, 25 insertions(+), 8 deletions(-)
---
diff --git a/0001-Add-man-pages.patch b/0001-Add-man-pages.patch
index fc80f30..6070104 100644
--- a/0001-Add-man-pages.patch
+++ b/0001-Add-man-pages.patch
@@ -1,6 +1,6 @@
diff -up glade-3.15.0/configure.ac.man-pages glade-3.15.0/configure.ac
--- glade-3.15.0/configure.ac.man-pages 2013-03-06 15:58:47.000000000 -0500
-+++ glade-3.15.0/configure.ac 2013-06-26 14:23:46.390060044 -0400
++++ glade-3.15.0/configure.ac 2013-06-26 15:02:30.060301314 -0400
@@ -195,6 +195,22 @@ AM_CONDITIONAL(BUILD_PYTHON, test x"$hav
YELP_HELP_INIT
@@ -39,9 +39,22 @@ diff -up glade-3.15.0/configure.ac.man-pages glade-3.15.0/configure.ac
+ Build Manual Pages: ${enable_man_pages}
"
diff -up glade-3.15.0/Makefile.am.man-pages glade-3.15.0/Makefile.am
+--- glade-3.15.0/Makefile.am.man-pages 2013-06-26 15:04:34.414063451 -0400
++++ glade-3.15.0/Makefile.am 2013-06-26 15:05:09.949281239 -0400
+@@ -1,6 +1,10 @@
+ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+
+ SUBDIRS = po data gladeui src plugins doc help
++if BUILD_MAN_PAGES
++SUBDIRS += man
++endif
++DIST_SUBDIRS = po data gladeui src plugins doc help man
+
+ EXTRA_DIST = \
+ autogen.sh \
diff -up glade-3.15.0/man/glade-previewer.xml.man-pages glade-3.15.0/man/glade-previewer.xml
---- glade-3.15.0/man/glade-previewer.xml.man-pages 2013-06-26 14:22:25.196562427 -0400
-+++ glade-3.15.0/man/glade-previewer.xml 2013-06-26 14:22:25.196562427 -0400
+--- glade-3.15.0/man/glade-previewer.xml.man-pages 2013-06-26 15:02:30.061301320 -0400
++++ glade-3.15.0/man/glade-previewer.xml 2013-06-26 15:02:30.060301314 -0400
@@ -0,0 +1,105 @@
+<?xml version='1.0'?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
@@ -149,8 +162,8 @@ diff -up glade-3.15.0/man/glade-previewer.xml.man-pages glade-3.15.0/man/glade-p
+
+</refentry>
diff -up glade-3.15.0/man/glade.xml.man-pages glade-3.15.0/man/glade.xml
---- glade-3.15.0/man/glade.xml.man-pages 2013-06-26 14:22:25.196562427 -0400
-+++ glade-3.15.0/man/glade.xml 2013-06-26 14:22:25.196562427 -0400
+--- glade-3.15.0/man/glade.xml.man-pages 2013-06-26 15:02:30.061301320 -0400
++++ glade-3.15.0/man/glade.xml 2013-06-26 15:02:30.061301320 -0400
@@ -0,0 +1,114 @@
+<?xml version='1.0'?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
@@ -267,8 +280,8 @@ diff -up glade-3.15.0/man/glade.xml.man-pages glade-3.15.0/man/glade.xml
+
+</refentry>
diff -up glade-3.15.0/man/Makefile.am.man-pages glade-3.15.0/man/Makefile.am
---- glade-3.15.0/man/Makefile.am.man-pages 2013-06-26 14:22:25.196562427 -0400
-+++ glade-3.15.0/man/Makefile.am 2013-06-26 14:22:25.196562427 -0400
+--- glade-3.15.0/man/Makefile.am.man-pages 2013-06-26 15:02:30.061301320 -0400
++++ glade-3.15.0/man/Makefile.am 2013-06-26 15:02:30.061301320 -0400
@@ -0,0 +1,22 @@
+XSLTPROC_FLAGS = \
+ --nonet \
diff --git a/glade.spec b/glade.spec
index 8d5b6eb..c029c47 100644
--- a/glade.spec
+++ b/glade.spec
@@ -28,6 +28,8 @@ BuildRequires: python2-devel
BuildRequires: docbook-style-xsl
BuildRequires: libxslt
BuildRequires: autoconf automake libtool
+BuildRequires: intltool
+BuildRequires: gnome-common
Requires: %{name}-libs = %{version}-%{release}
# The gtk3 version of glade was packaged under the name of 'glade3' for a
@@ -69,7 +71,9 @@ developing applications that use Glade widget library.
%patch0 -p1 -b .keywords
%patch1 -p1 -b .man-pages
-autoreconf -i -f
+aclocal
+autoconf
+automake
%build
%configure --disable-static
More information about the scm-commits
mailing list