[dia] Build without GNOME (2) support (#996759)

Jiří Popelka jpopelka at fedoraproject.org
Thu Aug 15 17:29:46 UTC 2013


commit 5f479533c2b0ec5574d614a92807c3ab1413f77b
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Thu Aug 15 19:28:09 2013 +0200

    Build without GNOME (2) support (#996759)

 dia.spec |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)
---
diff --git a/dia.spec b/dia.spec
index 951fbec..6209bab 100644
--- a/dia.spec
+++ b/dia.spec
@@ -1,6 +1,6 @@
 Name:           dia
 Version:        0.97.2
-Release:        6%{?dist}
+Release:        7%{?dist}
 Epoch:          1
 Summary:        Diagram drawing program
 Group:          Applications/Multimedia
@@ -11,7 +11,7 @@ Patch0:         dia-noglib.patch
 Patch1:         dia-unregister-import.patch
 Patch2:         dia-glib.patch
 
-BuildRequires:  libgnomeui-devel pygtk2-devel desktop-file-utils
+BuildRequires:  gtk2-devel libxml2-devel libart_lgpl-devel desktop-file-utils
 BuildRequires:  intltool docbook-utils docbook-style-dsssl docbook-style-xsl
 BuildRequires:  gettext
 BuildRequires:  rarian-compat
@@ -33,7 +33,7 @@ and can export to PostScript(TM).
 %patch1 -p1 -b .unregister-import
 %patch2 -p1 -b .glib
 
-sed -i 's|libdia_la_LDFLAGS = -avoid-version|libdia_la_LDFLAGS = -avoid-version $(shell pkg-config gtk+-2.0 libxml-2.0 libart-2.0 libgnome-2.0 --libs)|' \
+sed -i 's|libdia_la_LDFLAGS = -avoid-version|libdia_la_LDFLAGS = -avoid-version $(shell pkg-config gtk+-2.0 libxml-2.0 libart-2.0 --libs)|' \
   lib/Makefile.*
 chmod -x `find objects/AADL -type f`
 iconv -f WINDOWS-1252 -t UTF8 doc/en/usage-layers.xml > usage-layers.xml.UTF-8
@@ -45,13 +45,13 @@ mv usage-layers.xml.UTF-8 doc/en/usage-layers.xml
 # should be safe to remove once configure is Autoconf => 2.68 generated, i.e.
 # with dia > 0.97.2
 autoreconf --verbose --force --install
-%configure --enable-gnome --enable-db2html
+%configure --enable-db2html
 make %{?_smp_mflags}
  
 
 %install
 make install DESTDIR=$RPM_BUILD_ROOT
-%find_lang %{name} --with-man --with-gnome
+%find_lang %{name} --with-man
 
 # Since we're not using the cairo stuff, but a stub plugin still
 # gets built, Dia complains it doesn't have an init function.  So
@@ -96,12 +96,13 @@ fi
 %{_datadir}/applications/%{name}.desktop
 %endif
 %dir %{_libdir}/%{name}
-# find_lang --with-gnome desn't find the following because it's just a symlink
-%{_datadir}/gnome/help/%{name}/C
 %{_datadir}/mime-info/*
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Thu Aug 15 2013 Jiri Popelka <jpopelka at redhat.com> - 1:0.97.2-7
+- Build without GNOME (2) support (#996759)
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:0.97.2-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 


More information about the scm-commits mailing list