fixes to "make rpm"

diff --git a/plugin.demo/xgtk/Makefile.am b/plugin.demo/xgtk/Makefile.am
index cb0badd8593f5eab943dc4b2daca2e216511bfbd..a2f5d603c23e50bf74ed33c04d3d505e975b6248 100644 (file)
--- 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 bec81bb6db336101ffbea0b39a140fa95b16b493..f25f4305c0e94e92020fe85ec68d501bca127f8a 100644 (file)
--- 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 671451206c6d4803a5e1abdc6c1d8ad0b203bd9f..37c013cee7b481ad34d1bf0df46e9e1a491bd9c3 100644 (file)
--- 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 abb33a3ee0bd2be54675f8327a43687b93d67d9f..572b081ce576070f56978a6061fb0226483233e8 100644 (file)
--- 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