From: ellson <devnull@localhost>
Date: Thu, 30 Jul 2009 17:58:16 +0000 (+0000)
Subject: fixes to "make rpm"
X-Git-Tag: LAST_LIBGRAPH~32^2~1772
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=43dc9f78cfb5fdbb8119548d9fd52657f087d5fd;p=graphviz

fixes to "make rpm"
---

diff --git a/plugin.demo/xgtk/Makefile.am b/plugin.demo/xgtk/Makefile.am
index cb0badd85..a2f5d603c 100644
--- a/plugin.demo/xgtk/Makefile.am
+++ b/plugin.demo/xgtk/Makefile.am
@@ -6,3 +6,5 @@ SUBDIRS=src
 rpm: dist
 	rpmbuild -ta xgtk-plugin-@VERSION@.tar.gz
 
+EXTRA_DIST = xgtk-plugin.spec
+
diff --git a/plugin.demo/xgtk/configure.ac b/plugin.demo/xgtk/configure.ac
index bec81bb6d..f25f4305c 100644
--- a/plugin.demo/xgtk/configure.ac
+++ b/plugin.demo/xgtk/configure.ac
@@ -39,9 +39,12 @@ else
 fi
 AM_CONDITIONAL(WITH_GVC, [test "x$use_gvc" = "xYes"])
 
-# FIXME - this should be automatically obtained
-GVPLUGIN_VERSION_INFO='6:0:0'
-AC_SUBST(GVPLUGIN_VERSION_INFO)
+if test "x$use_gvc" = "xYes"; then
+    GVPLUGIN_VERSION_INFO=`pkg-config libgvc --variable=plugins`:0:0
+    AC_SUBST(GVPLUGIN_VERSION_INFO)
+    GVPLUGIN_DIR=`pkg-config libgvc --variable=libdir`/graphviz
+    AC_SUBST(GVPLUGIN_DIR)
+fi
 
 dnl -----------------------------------
 dnl INCLUDES and LIBS for GTK.
diff --git a/plugin.demo/xgtk/src/Makefile.am b/plugin.demo/xgtk/src/Makefile.am
index 671451206..37c013cee 100644
--- a/plugin.demo/xgtk/src/Makefile.am
+++ b/plugin.demo/xgtk/src/Makefile.am
@@ -5,7 +5,7 @@ ACLOCAL_AMFLAGS = -I m4
 AM_CPPFLAGS = $(GVC_CFLAGS) $(GTK_CFLAGS)
 
 #override pkglibdir
-pkglibdir = $(libdir)/graphviz
+pkglibdir = @GVPLUGIN_DIR@
 
 noinst_HEADERS = support.h interface.h callbacks.h
 noinst_LTLIBRARIES = libgvplugin_gtk_C.la
diff --git a/plugin.demo/xgtk/xgtk-plugin.spec.in b/plugin.demo/xgtk/xgtk-plugin.spec.in
index abb33a3ee..572b081ce 100644
--- a/plugin.demo/xgtk/xgtk-plugin.spec.in
+++ b/plugin.demo/xgtk/xgtk-plugin.spec.in
@@ -19,9 +19,6 @@ Source0: http://www.graphviz.org/pub/@GRAPHVIZ_SOURCES@/xgtk-plugin-@VERSION@.ta
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: graphviz-devel gtk2-devel
 
-Requires(post):   /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
-
 %description
 A graphviz plugin providind a gtk UI to graphviz.  
 
@@ -44,6 +41,7 @@ fi
 %doc AUTHORS COPYING ChangeLog NEWS README
 %dir %{_libdir}/graphviz
 %{_libdir}/graphviz/*.so.*
+%exclude %{_libdir}/graphviz/*.so
 
 #-- building --------------------------------------------------
 
@@ -65,19 +63,12 @@ CFLAGS="$RPM_OPT_FLAGS" \
         --mandir=%{_mandir} \
         --with-x \
 	--disable-static \
-        --disable-dependency-tracking \
+        --disable-dependency-tracking
 make %{?_smp_mflags}
 
 %install
-rm -rf %{buildroot} __doc
-make DESTDIR=%{buildroot} \
-        docdir=%{buildroot}%{_docdir}/%{name} \
-        pkgconfigdir=%{_libdir}/pkgconfig \
-        install
+make DESTDIR=%{buildroot} install
 find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
-chmod -x %{buildroot}%{_datadir}/%{name}/lefty/*
-cp -a %{buildroot}%{_datadir}/%{name}/doc __doc
-rm -rf %{buildroot}%{_datadir}/%{name}/doc
 
 %check
 %ifnarch ppc64 ppc