rpms/ppl/devel ppl-0.10-configure.patch, NONE, 1.1 ppl.spec, 1.23, 1.24

Roberto Bagnara bagnara at fedoraproject.org
Wed Feb 18 22:28:44 UTC 2009 

Author: bagnara

Update of /cvs/pkgs/rpms/ppl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12777

Modified Files:
	ppl.spec 
Added Files:
	ppl-0.10-configure.patch 
Log Message:
Install the documentation according to the Fedora packaging conventions.


ppl-0.10-configure.patch:

--- NEW FILE ppl-0.10-configure.patch ---
diff -ur ppl-0.10/Watchdog/doc/Makefile.in ppl-0.10-patched/Watchdog/doc/Makefile.in
--- ppl-0.10/Watchdog/doc/Makefile.in	2008-11-04 10:36:59.000000000 +0100
+++ ppl-0.10-patched/Watchdog/doc/Makefile.in	2009-02-18 23:15:28.000000000 +0100
@@ -163,7 +163,7 @@
 debug_flag = @debug_flag@
 
 # All the documentation in docdir.
-docdir = @docdir@
+docdir = @docdir@/pwl
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
diff -ur ppl-0.10/configure ppl-0.10-patched/configure
--- ppl-0.10/configure	2008-11-04 10:37:00.000000000 +0100
+++ ppl-0.10-patched/configure	2009-02-18 22:36:56.000000000 +0100
@@ -2923,10 +2923,6 @@
 PPL_CONFIGURE_OPTIONS="\"$ac_configure_args\""
 
 
-# Installation directories.
-docdir='${datadir}/doc/ppl'
-
-
 # Generate a configuration header file.
 ac_config_headers="$ac_config_headers config.h"
 


Index: ppl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ppl/devel/ppl.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- ppl.spec	17 Feb 2009 20:57:38 -0000	1.23
+++ ppl.spec	18 Feb 2009 22:28:14 -0000	1.24
@@ -2,7 +2,7 @@
 
 Name:           ppl
 Version:        0.10
-Release:        7%{?dist}
+Release:        8%{?dist}
 
 Summary:        The Parma Polyhedra Library: a library of numerical abstractions
 Group:          Development/Libraries
@@ -13,7 +13,7 @@
 Source2:        ppl_c.h
 Source3:        pwl.hh
 Patch0:         ppl-0.10-bigendian.patch
-#Patch1:        none
+Patch1:         ppl-0.10-configure.patch
 #Icon:
 #Requires:
 Requires(post): /sbin/ldconfig
@@ -199,7 +199,7 @@
 %prep
 %setup -q
 %patch0 -p1
-#%patch1 -p1
+%patch1 -p1
 
 %build
 CPPFLAGS="-I%{_includedir}/glpk"
@@ -207,7 +207,7 @@
 CPPFLAGS="$CPPFLAGS -I%{_libdir}/gprolog-`gprolog --version 2>&1 | head -1 | sed -e "s/.* \([^ ]*\)$/\1/g"`/include"
 %endif
 CPPFLAGS="$CPPFLAGS -I%{_includedir}/Yap"
-%configure --enable-shared --disable-rpath --enable-interfaces="c++ c gnu_prolog swi_prolog yap_prolog java" CPPFLAGS="$CPPFLAGS"
+%configure --docdir=%{_datadir}/doc/%{name}-%{version} --enable-shared --disable-rpath --enable-interfaces="c++ c gnu_prolog swi_prolog yap_prolog java" CPPFLAGS="$CPPFLAGS"
 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
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' Watchdog/libtool
@@ -245,26 +245,26 @@
 # Install the Javadocs for ppl-java.
 mkdir -p %{buildroot}%{_javadocdir}
 mv \
-%{buildroot}/%{_datadir}/doc/%{name}/ppl-user-java-interface-%{version}-html \
+%{buildroot}/%{_datadir}/doc/%{name}-%{version}/ppl-user-java-interface-%{version}-html \
 %{buildroot}%{_javadocdir}/%{name}-java
 
 %files
 %defattr(-,root,root,-)
-%doc %{_datadir}/doc/%{name}/BUGS
-%doc %{_datadir}/doc/%{name}/COPYING
-%doc %{_datadir}/doc/%{name}/CREDITS
-%doc %{_datadir}/doc/%{name}/ChangeLog
-%doc %{_datadir}/doc/%{name}/NEWS
-%doc %{_datadir}/doc/%{name}/README
-%doc %{_datadir}/doc/%{name}/README.configure
-%doc %{_datadir}/doc/%{name}/TODO
-%doc %{_datadir}/doc/%{name}/gpl.*
+%doc %{_datadir}/doc/%{name}-%{version}/BUGS
+%doc %{_datadir}/doc/%{name}-%{version}/COPYING
+%doc %{_datadir}/doc/%{name}-%{version}/CREDITS
+%doc %{_datadir}/doc/%{name}-%{version}/ChangeLog
+%doc %{_datadir}/doc/%{name}-%{version}/NEWS
+%doc %{_datadir}/doc/%{name}-%{version}/README
+%doc %{_datadir}/doc/%{name}-%{version}/README.configure
+%doc %{_datadir}/doc/%{name}-%{version}/TODO
+%doc %{_datadir}/doc/%{name}-%{version}/gpl.*
 %{_libdir}/libppl.so.*
 %{_libdir}/libppl_c.so.*
 %{_bindir}/ppl-config
 %{_mandir}/man1/ppl-config.1.gz
 %dir %{_libdir}/%{name}
-%dir %{_datadir}/doc/%{name}
+%dir %{_datadir}/doc/%{name}-%{version}
 
 %files devel
 %defattr(-,root,root,-)
@@ -345,34 +345,34 @@
 
 %files docs
 %defattr(-,root,root,-)
-%doc %{_datadir}/doc/%{name}/README.doc
-%doc %{_datadir}/doc/%{name}/fdl.*
-%doc %{_datadir}/doc/%{name}/ppl-user-%{version}-html/
-%doc %{_datadir}/doc/%{name}/ppl-user-c-interface-%{version}-html/
-#%doc %{_datadir}/doc/%{name}/ppl-user-ocaml-interface-%{version}-html/
-%doc %{_datadir}/doc/%{name}/ppl-user-prolog-interface-%{version}-html/
-%doc %{_datadir}/doc/%{name}/ppl-user-%{version}.pdf
-%doc %{_datadir}/doc/%{name}/ppl-user-c-interface-%{version}.pdf
-%doc %{_datadir}/doc/%{name}/ppl-user-java-interface-%{version}.pdf
-#%doc %{_datadir}/doc/%{name}/ppl-user-ocaml-interface-%{version}.pdf
-%doc %{_datadir}/doc/%{name}/ppl-user-prolog-interface-%{version}.pdf
-%doc %{_datadir}/doc/%{name}/ppl-user-%{version}.ps.gz
-%doc %{_datadir}/doc/%{name}/ppl-user-c-interface-%{version}.ps.gz
-%doc %{_datadir}/doc/%{name}/ppl-user-java-interface-%{version}.ps.gz
-#%doc %{_datadir}/doc/%{name}/ppl-user-ocaml-interface-%{version}.ps.gz
-%doc %{_datadir}/doc/%{name}/ppl-user-prolog-interface-%{version}.ps.gz
+%doc %{_datadir}/doc/%{name}-%{version}/README.doc
+%doc %{_datadir}/doc/%{name}-%{version}/fdl.*
+%doc %{_datadir}/doc/%{name}-%{version}/ppl-user-%{version}-html/
+%doc %{_datadir}/doc/%{name}-%{version}/ppl-user-c-interface-%{version}-html/
+#%doc %{_datadir}/doc/%{name}-%{version}/ppl-user-ocaml-interface-%{version}-html/
+%doc %{_datadir}/doc/%{name}-%{version}/ppl-user-prolog-interface-%{version}-html/
+%doc %{_datadir}/doc/%{name}-%{version}/ppl-user-%{version}.pdf
+%doc %{_datadir}/doc/%{name}-%{version}/ppl-user-c-interface-%{version}.pdf
+%doc %{_datadir}/doc/%{name}-%{version}/ppl-user-java-interface-%{version}.pdf
+#%doc %{_datadir}/doc/%{name}-%{version}/ppl-user-ocaml-interface-%{version}.pdf
+%doc %{_datadir}/doc/%{name}-%{version}/ppl-user-prolog-interface-%{version}.pdf
+%doc %{_datadir}/doc/%{name}-%{version}/ppl-user-%{version}.ps.gz
+%doc %{_datadir}/doc/%{name}-%{version}/ppl-user-c-interface-%{version}.ps.gz
+%doc %{_datadir}/doc/%{name}-%{version}/ppl-user-java-interface-%{version}.ps.gz
+#%doc %{_datadir}/doc/%{name}-%{version}/ppl-user-ocaml-interface-%{version}.ps.gz
+%doc %{_datadir}/doc/%{name}-%{version}/ppl-user-prolog-interface-%{version}.ps.gz
 
 %files pwl
 %defattr(-,root,root,-)
-%doc %{_datadir}/doc/pwl/BUGS
-%doc %{_datadir}/doc/pwl/COPYING
-%doc %{_datadir}/doc/pwl/CREDITS
-%doc %{_datadir}/doc/pwl/ChangeLog
-%doc %{_datadir}/doc/pwl/NEWS
-%doc %{_datadir}/doc/pwl/README
-%doc %{_datadir}/doc/pwl/gpl.*
+%doc %{_datadir}/doc/%{name}-%{version}/pwl/BUGS
+%doc %{_datadir}/doc/%{name}-%{version}/pwl/COPYING
+%doc %{_datadir}/doc/%{name}-%{version}/pwl/CREDITS
+%doc %{_datadir}/doc/%{name}-%{version}/pwl/ChangeLog
+%doc %{_datadir}/doc/%{name}-%{version}/pwl/NEWS
+%doc %{_datadir}/doc/%{name}-%{version}/pwl/README
+%doc %{_datadir}/doc/%{name}-%{version}/pwl/gpl.*
 %{_libdir}/libpwl.so.*
-%dir %{_datadir}/doc/pwl
+%dir %{_datadir}/doc/%{name}-%{version}/pwl
 
 %files pwl-devel
 %defattr(-,root,root,-)
@@ -386,11 +386,11 @@
 
 %files pwl-docs
 %defattr(-,root,root,-)
-%doc %{_datadir}/doc/pwl/README.doc
-%doc %{_datadir}/doc/pwl/fdl.*
-%doc %{_datadir}/doc/pwl/pwl-user-0.5-html/
-%doc %{_datadir}/doc/pwl/pwl-user-0.5.pdf
-%doc %{_datadir}/doc/pwl/pwl-user-0.5.ps.gz
+%doc %{_datadir}/doc/%{name}-%{version}/pwl/README.doc
+%doc %{_datadir}/doc/%{name}-%{version}/pwl/fdl.*
+%doc %{_datadir}/doc/%{name}-%{version}/pwl/pwl-user-0.5-html/
+%doc %{_datadir}/doc/%{name}-%{version}/pwl/pwl-user-0.5.pdf
+%doc %{_datadir}/doc/%{name}-%{version}/pwl/pwl-user-0.5.ps.gz
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
@@ -401,9 +401,12 @@
 rm -rf %{buildroot}
 
 %changelog
+* Wed Feb 18 2009 Roberto Bagnara <bagnara at cs.unipr.it> 0.10-8
+- Install the documentation according to the Fedora packaging conventions.
+
 * Wed Feb 17 2009 Karsten Hopp <karsten at redhat.comt> 0.10-7
-- there are no prolog packages available on s390 and s390, disable them
-  similar to ppc64
+- There are no GNU Prolog packages available on s390 and s390: disable
+  the GNU Prolog interface also on those platforms (besides ppc64).
 
 * Wed Feb 04 2009 Roberto Bagnara <bagnara at cs.unipr.it> 0.10-6
 - Better workaround for the bug affecting PPL 0.10 on big-endian

More information about the scm-commits mailing list