[giggle] Fix FTBFS.

Jon Ciesla limb at fedoraproject.org
Wed Jan 25 02:04:01 UTC 2012


commit 6811c07c47b9d4d748a04d90c0e0f2bfd044dfcd
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Tue Jan 24 20:03:49 2012 -0600

    Fix FTBFS.

 .gitignore  |    1 +
 giggle.spec |   22 +++++++++++++++++-----
 sources     |    2 +-
 3 files changed, 19 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 88757aa..111bd32 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 giggle-0.5.tar.bz2
 /giggle-0.6.1.tar.xz
+/giggle-518c6e3587c.tar.gz
diff --git a/giggle.spec b/giggle.spec
index f997087..f954f01 100644
--- a/giggle.spec
+++ b/giggle.spec
@@ -1,12 +1,14 @@
 Name:          giggle
-Version:       0.6.1
-Release:       2%{?dist}
+Version:       0.7
+Release:       0.201201024git518c6e3587c%{?dist}
 Summary:       A Gtk frontend to git
 
 Group:         Development/Tools
 License:       GPLv2+
 URL:           http://live.gnome.org/giggle
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/giggle/0.6/%{name}-%{version}.tar.xz
+#Source0:       http://ftp.gnome.org/pub/GNOME/sources/giggle/0.6/%{name}-%{version}.tar.xz
+# git clone done 2012-01-24
+Source0:       giggle-518c6e3587c.tar.gz
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: intltool
@@ -20,6 +22,7 @@ BuildRequires: evolution-data-server-devel
 BuildRequires: vte3-devel
 BuildRequires: gnome-common
 BuildRequires: itstool
+BuildRequires: yelp-tools
 
 Requires:      git-core
 
@@ -37,12 +40,18 @@ Requires:	%{name} = %{version}-%{release}
 Headers for developing plugins for Giggle.
 
 %prep
-%setup -q
+%setup -qn giggle-518c6e3587c
 
 %build
-%configure --disable-static
+./autogen.sh
+
+
+%configure --enable-static=no
 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
+#libpng15, not libpng12.
+find -name 'Makefile' | xargs sed -i s/libpng12/libpng15/g
+
 make %{?_smp_mflags}
 
 
@@ -108,6 +117,9 @@ fi
 %{_libdir}/*.so
 
 %changelog
+* Tue Jan 24 2012 Jon Ciesla <limburgher at gmail.com> - 0.7-0.201201024git518c6e3587c
+- New upstream snapshot, fixes FTBFS.
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
diff --git a/sources b/sources
index cdc050f..bba88c3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-dd80ffa12f10a1c687bd3e730a14ca8b  giggle-0.6.1.tar.xz
+ece8113b4229f8e06115bc4ab03dd40a  giggle-518c6e3587c.tar.gz


More information about the scm-commits mailing list