[geda-gaf] Fixes broken dependency libgmp.so.3 on rawhide and FTBFS with glib headers

Mon Dec 5 17:55:45 UTC 2011

commit 49e86a03aa3308752280e5597119d78ead7a4397
Author: Chitlesh GOORAH <chitlesh at fedoraproject.org>
Date:   Mon Dec 5 18:55:30 2011 +0100

    Fixes broken dependency libgmp.so.3 on rawhide and FTBFS with glib headers

 geda-gaf.spec                                      |   90 ++++++++++++++++++--
 ...erences-to-glib-headers-other-than-glib-h.patch |   13 +++
 2 files changed, 95 insertions(+), 8 deletions(-)
---

diff --git a/geda-gaf.spec b/geda-gaf.spec
index 77b6713..b152a44 100644
--- a/geda-gaf.spec
+++ b/geda-gaf.spec
@@ -1,24 +1,50 @@
+# Features in Fedora/Free Electronic Lab
+#   Supported targets: EL-5, EL-6, F-15, F-16 and rawhide
+
 # As from 1.5, all the submodules of geda-gaf are packaged by upstream into one
-# big tarball. This requires a new fedora package review and obsoleting the old
-# geda-* packages fedora was providing, which explains the use of Epoch.
+# big tarball. This obsoletes the old geda-* packages fedora was providing
+# and explains the use of Epoch.
+
+#
+## To download development trunk
+#
+# $ git clone git://git.gpleda.org/gaf.git geda-gaf.1.7.1
+# $ tar cjf ~/rpmbuild/SOURCES/geda-gaf.1.7.1.`date '+%Y%m%d'`git.tar.bz2 geda-gaf.1.7.1
+
+# Toggle the following declaration when using version controlled snapshots
+%define devel 0
+
+# Known bug reports not treated by this SPEC:
+# L#900122 gschem crashes on ctrl-x - Upstream and FEL can't reproduce the issue
 
 Name:           geda-gaf
 Epoch:          1
+%if %{?devel}
+Version:        1.7.1
+%define snap    .20111205git       
+%else
 Version:        1.6.2
-Release:        4%{?dist}
+%endif
+Release:        5%{?snap}%{?dist}
 Summary:        Design Automation toolkit for electronic design
 
 Group:          Applications/Engineering
 License:        GPLv2+
-URL:            http://www.geda.seul.org
+URL:            http://gpleda.org
+%if %{?devel}
+Source0:        %{name}-%{version}%{snap}.tar.bz2
+%else
 Source0:        http://geda.seul.org/devel/v1.6/%{version}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# Applied patch for RHBZ# 604288
+# Applied patch for RHBZ#604288
 Patch0:         gaf.git-334307f0c4f68f704eec422af077b9e32d37b177.patch
+%endif
+Patch1:         libgeda-references-to-glib-headers-other-than-glib-h.patch
 
 BuildRequires:  desktop-file-utils gettext-devel gawk intltool
 BuildRequires:  gd-devel libtool-ltdl-devel shared-mime-info
+BuildRequires:  libtool
 
 Requires:       geda-docs      = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       geda-gattrib   = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -161,13 +187,24 @@ Several utilities for the gEDA project.
 
 
 %prep
+%if %{?devel}
+%setup -q -n %{name}
+%else
 %setup -q
+%endif
 
+# Bug 750023 - references to glib headers other than glib.h
+%patch1 -p0 -b .glib.h
+
+%if %{?devel}
+./autogen.sh
+%else
 %patch0 -p1 -b .RHBZ604288
 
 # Implicit DSO linking
 # undefined reference to symbol 'atan2@@GLIBC_2.0'
 sed -i "s|(gschem_LINK) \$(gschem_OBJECTS)|(gschem_LINK) -lm \$(gschem_OBJECTS)|" gschem/src/Makefile.in
+%endif
 
 # rpmlint UTF-8
 for f in symbols/{AUTHORS,ChangeLog-1.0} gschem/ChangeLog; do
@@ -205,7 +242,9 @@ desktop-file-install --vendor "" \
 
 
 # locale's
-for i in libgeda38 geda-gattrib geda-gschem ; do
+# libgeda38 => 1.6.2
+# libgeda40 => 1.7.1
+for i in libgeda38 libgeda40 geda-gattrib geda-gschem ; do
     if [ -d %{buildroot}%{_datadir}/locale/ ]; then
         for lang_dir in %{buildroot}%{_datadir}/locale/* ; do
             lang=$(basename $lang_dir)
@@ -237,6 +276,7 @@ install -pm 644 gschem/examples/README.* %{buildroot}%{_docdir}/%{name}/examples
 
 find %{buildroot}%{_docdir} -name 'Makefile*' -exec rm -f '{}' \;
 %{__rm} -f %{buildroot}%{_datadir}/mime/version
+%{__rm} -f %{buildroot}%{_datadir}/info/dir
 
 %post -n geda-symbols
 update-mime-database %{_datadir}/mime &> /dev/null || :
@@ -300,10 +340,14 @@ make distcheck
 
 %files
 %defattr(-,root,root,-)
-%doc ABOUT-NLS AUTHORS ChangeLog COPYING README NEWS
+%doc ABOUT-NLS AUTHORS ChangeLog COPYING* README NEWS
 
 
+%if %{?devel}
+%files -n libgeda -f libgeda40.lang
+%else
 %files -n libgeda -f libgeda38.lang
+%endif
 %defattr(-,root,root,-)
 %doc libgeda/{HACKING,ChangeLog*,BUGS,TODO}
 %dir %{_datadir}/gEDA/
@@ -313,7 +357,9 @@ make distcheck
 %{_datadir}/gEDA/scheme/geda.scm
 %{_datadir}/gEDA/system-gafrc
 %{_datadir}/mime/packages/libgeda.xml
-
+%if %{?devel}
+%{_datadir}/info/geda-scheme.info.gz
+%endif
 
 %files -n libgeda-devel
 %defattr(-,root,root,-)
@@ -353,6 +399,9 @@ make distcheck
 %{_datadir}/gEDA/gattrib-menus.xml
 %{_datadir}/applications/geda-gattrib.desktop
 %{_datadir}/icons/hicolor/*/apps/geda-gattrib.*
+%if %{?devel}
+%{_mandir}/man1/gattrib.*
+%endif
 
 
 %files -n geda-gnetlist
@@ -360,7 +409,10 @@ make distcheck
 %doc gnetlist/{BUGS,ChangeLog*,TODO}
 %doc %{_docdir}/%{name}/gnetlist
 %{_bindir}/gnetlist
+%if %{?devel}
+%else
 %{_bindir}/mk_verilog_syms
+%endif
 %{_bindir}/sch2eaglepos.sh
 %{_bindir}/sw2asc
 %{_datadir}/gEDA/scheme/gnet*.scm
@@ -391,6 +443,21 @@ make distcheck
 %{_datadir}/gEDA/print-colormap-darkbg
 %{_datadir}/gEDA/print-colormap-lightbg
 %{_datadir}/gEDA/scheme/color-map.scm
+%if %{?devel}
+%{_datadir}/gEDA/gschem-colormap-bw
+%{_datadir}/gEDA/scheme/geda/attrib.scm
+%{_datadir}/gEDA/scheme/geda/deprecated.scm
+%{_datadir}/gEDA/scheme/geda/object.scm
+%{_datadir}/gEDA/scheme/geda/page.scm
+%{_datadir}/gEDA/scheme/gnetlist/backend-getopt.scm
+%{_datadir}/gEDA/scheme/gschem/attrib.scm
+%{_datadir}/gEDA/scheme/gschem/deprecated.scm
+%{_datadir}/gEDA/scheme/gschem/hook.scm
+%{_datadir}/gEDA/scheme/gschem/keymap.scm
+%{_datadir}/gEDA/scheme/gschem/selection.scm
+%{_datadir}/gEDA/scheme/gschem/window.scm
+%{_datadir}/gEDA/scheme/partslist-common.scm
+%endif
 %{_datadir}/mime/application/x-geda-schematic.xml
 %{_datadir}/applications/geda-gschem.desktop
 %{_mandir}/man1/gschem.*
@@ -434,9 +501,16 @@ make distcheck
 %{_datadir}/gEDA/system-gschlasrc
 %{_mandir}/man1/grenum.1.gz
 %{_datadir}/gEDA/perl/lib/gxyrs.pm
+%if %{?devel}
+%{_mandir}/man1/gsch2pcb.*
+%{_mandir}/man1/gxyrs.*
+%endif
 
 
 %changelog
+* Mon Dec 5 2011 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 1.6.2-5
+- Fixes broken dependency libgmp.so.3 on rawhide and FTBFS with glib headers
+
 * Sun Dec 4 2011 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 1.6.2-4
 - Fixes RHBZ#604288, RHBZ#710281, L#704829 - Refresh on in-use tab causes crash
 
diff --git a/libgeda-references-to-glib-headers-other-than-glib-h.patch b/libgeda-references-to-glib-headers-other-than-glib-h.patch
new file mode 100644
index 0000000..221de52
--- /dev/null
+++ b/libgeda-references-to-glib-headers-other-than-glib-h.patch
@@ -0,0 +1,13 @@
+--- libgeda/src/s_path.c		2011-12-05 18:03:32.863465821 +0100
++++ libgeda/src/s_path.c_back	2011-12-05 18:04:00.573987686 +0100
+@@ -37,9 +37,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ 
+-#include <glib/gmem.h>
+-#include <glib/gmessages.h>
+-#include <glib/gtypes.h>
++#include <glib.h>
+ 
+ #include "libgeda_priv.h"
+ 
