OBS User unknown 2007-08-15 18:23:58 +00:00 committed by Git OBS Bridge
parent ad0cd73d01
commit f264733136
8 changed files with 83 additions and 3 deletions

View File

@ -0,0 +1,11 @@
--- lib/sfio/sfhdr.h
+++ lib/sfio/sfhdr.h
@@ -493,7 +493,7 @@
if((lv = localeconv())) \
{ if(lv->decimal_point && lv->decimal_point[0]) \
*(decimal) = lv->decimal_point[0]; \
- if(thousand && lv->thousands_sep && lv->thousands_sep[0]) \
+ if(thousand != NULL && lv->thousands_sep && lv->thousands_sep[0]) \
*(thousand) = lv->thousands_sep[0]; \
} \
} \

View File

@ -18,3 +18,11 @@
libgv_perl_la_LIBADD = $(BASELIBS) @PERL_LIBS@
libgv_perl_la_LDFLAGS =
gv_perl.cpp $(PERL_hdr): gv.i
@@ -86,6 +86,7 @@
pkgphpdir = $(pkglibdir)/php
PHP_hdr = gv.php php_gv.h
nodist_libgv_php_la_SOURCES = gv_php.cpp $(PHP_hdr)
+libgv_php_la_CXXFLAGS = -fno-strict-aliasing
libgv_php_la_SOURCES = $(BASESOURCES)
libgv_php_la_LIBADD = $(BASELIBS) @PHP_LIBS@
libgv_php_la_LDFLAGS =

View File

@ -0,0 +1,11 @@
--- configure.ac
+++ configure.ac
@@ -633,7 +633,7 @@
AC_MSG_WARN([swig does not support php. The PHP packages will not be built])
else
AC_CHECK_PROG(PHP,php,php)
-PHP_INCLUDES="-I/usr/include/php -I/usr/include/php/main -I/usr/include/php/Zend -I/usr/include/php/TSRM"
+PHP_INCLUDES="-I/usr/include/php5 -I/usr/include/php5/main -I/usr/include/php5/Zend -I/usr/include/php5/TSRM"
PHP_LIBS=
save_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $PHP_INCLUDES"

View File

@ -0,0 +1,11 @@
# This line is mandatory to access the configuration functions
from Config import *
addFilter("graphviz-tcl devel-file-in-non-devel-package")
addFilter("graphviz-sharp devel-file-in-non-devel-package")
addFilter("graphviz-ruby devel-file-in-non-devel-package")
addFilter("graphviz-python devel-file-in-non-devel-package")
addFilter("graphviz-php devel-file-in-non-devel-package")
addFilter("graphviz-perl devel-file-in-non-devel-package")
addFilter("graphviz-lua devel-file-in-non-devel-package")
addFilter("graphviz-guile devel-file-in-non-devel-package")

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Mon Aug 13 19:23:50 CEST 2007 - pth@suse.de
- lib/sfio/sfhdr.h(SFSETLOCALE): fix test for null pointer.
- Fix include paths for php5
- Move gv_php man page to where man searches for it.
- Use %%fdupes
- Add rpmlintrc
- use -fno-strict-aliasing for gv_php
-------------------------------------------------------------------
Mon Jun 11 18:13:15 CEST 2007 - ro@suse.de

View File

@ -21,11 +21,12 @@ BuildRequires: xorg-x11-libX11-devel xorg-x11-libXext-devel xorg-x11-libXmu-dev
BuildRequires: cairo-devel gcc-java gmp-devel guile-devel libgcj-devel lua-devel mono-core ocaml pango-devel
BuildRequires: graphviz libgnomeui-devel php5-devel
Version: 2.12
Release: 8
Release: 9
Autoreqprov: on
Summary: Graph Visualization Tools
Group: Productivity/Graphics/Visualization/Graph
Source: http://www.graphviz.org/pub/graphviz/ARCHIVE/%{mname}-%{version}.tar.bz2
Source1: %{name}-rpmlintrc
Patch0: graphviz-fix-pkgIndex.patch
Patch1: graphviz-aliasing-fixes.patch
Patch3: graphviz-fix_swig_template.patch
@ -36,6 +37,8 @@ Patch8: graphviz-2.11-php_check.patch
Patch9: graphviz-no_libtool_patching.patch
Patch10: graphviz-fix_manpages.patch
Patch11: graphviz-gv_aliasing.patch
Patch12: graphviz-php5_include_dirs.patch
Patch13: graphviz-codecleanup.patch
URL: http://www.graphviz.org/
License: IBM Public License
Prefix: /usr
@ -311,6 +314,8 @@ Authors:
%patch9
%patch10
%patch11
%patch12
%patch13
# Fix path in generated man pages
sed -e 's$@LIB_DIR@$%{_libdir}$g' tclpkg/gv/gv_doc_langs.tcl >tclpkg/gv/gv_doc_langs.tcl.new && mv tclpkg/gv/gv_doc_langs.tcl.new tclpkg/gv/gv_doc_langs.tcl
@ -382,10 +387,12 @@ rm -f %{buildroot}/%{_mandir}/man3/*.3.gz
rm -f %{buildroot}/%{_mandir}/man3/*.3
mv %{buildroot}%{_libdir}/%{mname}/tcl/gv_tcl.man %{buildroot}%{_mandir}/mann/gv_tcl.n
mv %{buildroot}%{_libdir}/%{mname}/perl/gv_perl.man %{buildroot}%{_mandir}/man3/gv_perl.3pm
for lang in ruby python lua ocaml sharp guile; do
for lang in ruby python lua ocaml sharp guile php; do
mv %{buildroot}%{_libdir}/%{mname}/$lang/gv_$lang.man %{buildroot}%{_mandir}/man3/gv_$lang.3
done
%fdupes %{buildroot}%{_docdir}
%clean
rm -rf %{buildroot}
@ -431,6 +438,7 @@ if ! test -x $RPM_INSTALL_PREFIX0/bin/dot; then rm -f $RPM_INSTALL_PREFIX0/%{_li
%files -n graphviz-php
%defattr(-,root,root,-)
%{_libdir}/graphviz/php
%doc %{_mandir}/man3/gv_php.3.gz
%files -n graphviz-python
%defattr(-,root,root,-)
@ -456,6 +464,13 @@ if ! test -x $RPM_INSTALL_PREFIX0/bin/dot; then rm -f $RPM_INSTALL_PREFIX0/%{_li
%doc __doc/*
%changelog
* Mon Aug 13 2007 - pth@suse.de
- lib/sfio/sfhdr.h(SFSETLOCALE): fix test for null pointer.
- Fix include paths for php5
- Move gv_php man page to where man searches for it.
- Use %%fdupes
- Add rpmlintrc
- use -fno-strict-aliasing for gv_php
* Mon Jun 11 2007 - ro@suse.de
- no main package, no debuginfo
* Wed Jun 06 2007 - pth@suse.de

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Aug 13 19:23:50 CEST 2007 - pth@suse.de
- lib/sfio/sfhdr.h(SFSETLOCALE): fix test for null pointer.
- use -fno-strict-aliasing for gv_php
-------------------------------------------------------------------
Fri May 11 10:32:20 CEST 2007 - ro@suse.de

View File

@ -17,7 +17,7 @@ BuildRequires: bison flex glib2-devel xorg-x11-devel
BuildRequires: xorg-x11-libICE-devel xorg-x11-libSM-devel xorg-x11-libXpm-devel
BuildRequires: xorg-x11-libX11-devel xorg-x11-libXext-devel xorg-x11-libXmu-devel xorg-x11-libXt-devel
Version: 2.12
Release: 21
Release: 35
Autoreqprov: on
Summary: Graph Visualization Tools
Group: Productivity/Graphics/Visualization/Graph
@ -32,6 +32,7 @@ Patch8: graphviz-2.11-php_check.patch
Patch9: graphviz-no_libtool_patching.patch
Patch10: graphviz-fix_manpages.patch
Patch11: graphviz-gv_aliasing.patch
Patch12: graphviz-codecleanup.patch
URL: http://www.graphviz.org/
License: IBM Public License
Prefix: /usr
@ -89,6 +90,7 @@ Authors:
%patch9
%patch10
%patch11
%patch12
# Fix path in generated man pages
sed -e 's$@LIB_DIR@$%{_libdir}$g' tclpkg/gv/gv_doc_langs.tcl >tclpkg/gv/gv_doc_langs.tcl.new && mv tclpkg/gv/gv_doc_langs.tcl.new tclpkg/gv/gv_doc_langs.tcl
@ -155,6 +157,9 @@ for manfile in $(find %{buildroot} -name \*.man); do
sed -e 's$/usr/lib/graphviz$%{_libdir}/%{name}$g' $manfile > ${manfile}.new && mv ${manfile}.new ${manfile}
done
%clean
rm -rf %buildroot
%post
# run "dot -c" to generate plugin config in %{_libdir}/graphviz/config
%{_bindir}/dot -c
@ -194,6 +199,9 @@ if ! test -x $RPM_INSTALL_PREFIX0/bin/dot; then rm -f $RPM_INSTALL_PREFIX0/%{_li
%exclude %{_libdir}/graphviz/*.so
%changelog
* Mon Aug 13 2007 - pth@suse.de
- lib/sfio/sfhdr.h(SFSETLOCALE): fix test for null pointer.
- use -fno-strict-aliasing for gv_php
* Fri May 11 2007 - ro@suse.de
- added get_release_number.sh to sync rel-number between
graphviz and graphviz-plugins