rpms/php-pear-Image-Graph/devel php-pear-Image-Graph.spec,1.3,1.4

[Christopher Stone]

Author: xulchris

Update of /cvs/pkgs/rpms/php-pear-Image-Graph/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8124/devel

Modified Files:
	php-pear-Image-Graph.spec 
Log Message:
merge subpackages


Index: php-pear-Image-Graph.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Image-Graph/devel/php-pear-Image-Graph.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- php-pear-Image-Graph.spec	28 Aug 2008 19:09:58 -0000	1.3
+++ php-pear-Image-Graph.spec	23 Oct 2008 22:16:20 -0000	1.4
@@ -3,7 +3,7 @@
 
 Name:           php-pear-Image-Graph
 Version:        0.7.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Displays numerical data as a graph/chart/plot
 
 Group:          Development/Languages
@@ -16,10 +16,17 @@
 BuildRequires:  php-pear >= 1:1.4.9-1.2
 Requires:       php-pear(PEAR)
 Requires:       php-pear(Image_Canvas) >= 0.3.0
+Requires:       php-pear(Numbers_Roman)
+Requires:       php-pear(Numbers_Words)
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
 Provides:       php-pear(%{pear_name}) = %{version}
 
+Provides:       php-pear-Image-Graph-roman = %{version}-%{release}
+Provides:       php-pear-Image-Graph-words = %{version}-%{release}
+Obsoletes:      php-pear-Image-Graph-roman < %{version}-%{release}
+Obsoletes:      php-pear-Image-Graph-words < %{version}-%{release}
+
 %description
 Image_Graph provides a set of classes that creates graphs/plots/charts based on
 (numerical) data.
@@ -35,24 +42,6 @@
 many different output formats, amongst others, GD (PNG, JPEG, GIF, WBMP),
 PDF (using PDFLib), Scalable Vector Graphics (SVG).
 
-%package roman
-Summary:        Numbers_Roman extension
-Group:          Development/Languages
-Requires:       php-pear(Numbers_Roman)
-Requires:       %{name} = %{version}-%{release}
-
-%description roman
-%{summary}.
-
-%package words
-Summary:        Numbers_Words extension
-Group:          Development/Languages
-Requires:       php-pear(Numbers_Words)
-Requires:       %{name} = %{version}-%{release}
-
-%description words
-%{summary}.
-
 
 %prep
 %setup -qc
@@ -74,13 +63,18 @@
 # Move documentation
 mkdir -p docdir
 mv $RPM_BUILD_ROOT%{pear_docdir}/* docdir
+
+# Clean up files
 find docdir -type f -exec sed -i 's/\r//' {} \;
+for file in $(find docdir -type f -name "*.php") ; do
+    iconv -f iso8859-1 -t utf-8 $file > $file.conv && mv -f $file.conv $file
+done
 
 # Clean up unnecessary files
 rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
 
 # Install XML package description
-mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
+install -d $RPM_BUILD_ROOT%{pear_xmldir}
 install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
 
 
@@ -104,39 +98,14 @@
 %doc %{pear_name}-%{version}/docdir/%{pear_name}/docs/*
 %{pear_xmldir}/%{pear_name}.xml
 %{pear_testdir}/%{pear_name}
-%{pear_phpdir}/Image/Graph.php
-%dir %{pear_phpdir}/Image/Graph
-%{pear_phpdir}/Image/Graph/*.php
-%{pear_phpdir}/Image/Graph/Axis
-%{pear_phpdir}/Image/Graph/DataSelector
-%{pear_phpdir}/Image/Graph/Dataset
-%{pear_phpdir}/Image/Graph/Figure
-%{pear_phpdir}/Image/Graph/Fill
-%{pear_phpdir}/Image/Graph/Grid
-%{pear_phpdir}/Image/Graph/Images
-%{pear_phpdir}/Image/Graph/Layout
-%{pear_phpdir}/Image/Graph/Line
-%{pear_phpdir}/Image/Graph/Marker
-%{pear_phpdir}/Image/Graph/Plot
-%{pear_phpdir}/Image/Graph/Plotarea
-%dir %{pear_phpdir}/Image/Graph/DataPreprocessor
-%{pear_phpdir}/Image/Graph/DataPreprocessor/Array.php
-%{pear_phpdir}/Image/Graph/DataPreprocessor/Currency.php
-%{pear_phpdir}/Image/Graph/DataPreprocessor/Date.php
-%{pear_phpdir}/Image/Graph/DataPreprocessor/Formatted.php
-%{pear_phpdir}/Image/Graph/DataPreprocessor/Function.php
-%{pear_phpdir}/Image/Graph/DataPreprocessor/Sequential.php
-
-%files roman
-%defattr(-,root,root,-)
-%{pear_phpdir}/Image/Graph/DataPreprocessor/RomanNumerals.php
-
-%files words
-%defattr(-,root,root,-)
-%{pear_phpdir}/Image/Graph/DataPreprocessor/NumberText.php
+%{pear_phpdir}/Image/Graph*
 
 
 %changelog
+* Thu Oct 23 2008 Christopher Stone <chris.stone at gmail.com> 0.7.2-4
+- Merge subpackages
+- Convert example files to UTF-8
+
 * Thu Aug 28 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.7.2-3
 - fix license tag