rpms/GMT/devel .cvsignore,1.3,1.4 GMT.spec,1.5,1.6 sources,1.3,1.4

Tue Feb 24 20:16:24 UTC 2009

Author: orion

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

Modified Files:
	.cvsignore GMT.spec sources 
Log Message:
* Tue Feb 24 2009 Orion Poplawski <orion at cora.nwra.com> 4.4.0-1
- Update to 4.4.0
- Merge doc package into main package as noarch sub-packages
- Merge examples sub-package into doc



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/GMT/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4

--- .cvsignore	21 May 2008 19:46:26 -0000	1.3
+++ .cvsignore	24 Feb 2009 20:15:53 -0000	1.4
@@ -1,4 +1,4 @@
-GMT4.3.1_scripts.tar.bz2
-GMT4.3.1_share.tar.bz2
-GMT4.3.1_src.tar.bz2
-GMT4.3.1_suppl.tar.bz2
+GMT4.4.0_share.tar.bz2
+GMT4.4.0_src.tar.bz2
+GMT4.4.0_suppl.tar.bz2
+GMT4.4.0_doc.tar.bz2


Index: GMT.spec
===================================================================
RCS file: /cvs/pkgs/rpms/GMT/devel/GMT.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- GMT.spec	23 Feb 2009 21:15:25 -0000	1.5
+++ GMT.spec	24 Feb 2009 20:15:54 -0000	1.6
@@ -1,13 +1,14 @@
 %define gmthome %{_datadir}/GMT
 %define gmtconf %{_sysconfdir}/GMT
+%define gmtdoc %{_docdir}/gmt
 
 %{!?octave_api: %define octave_api %(octave-config -p API_VERSION 2>/dev/null || echo 0)}
 %define octave_mdir %(octave-config -p LOCALAPIFCNFILEDIR || echo)
 %define octave_octdir %(octave-config -p LOCALAPIOCTFILEDIR || echo)
 
 Name:           GMT
-Version:        4.3.1
-Release:        3%{?dist}
+Version:        4.4.0
+Release:        1%{?dist}
 Summary:        Generic Mapping Tools
 
 Group:          Applications/Engineering
@@ -16,7 +17,7 @@
 Source0:        ftp://ftp.soest.hawaii.edu/gmt/GMT%{version}_src.tar.bz2
 Source1:        ftp://ftp.soest.hawaii.edu/gmt/GMT%{version}_share.tar.bz2
 Source2:        ftp://ftp.soest.hawaii.edu/gmt/GMT%{version}_suppl.tar.bz2
-Source3:        ftp://ftp.soest.hawaii.edu/gmt/GMT%{version}_scripts.tar.bz2
+Source3:        ftp://ftp.soest.hawaii.edu/gmt/GMT%{version}_doc.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libXt-devel libXaw-devel libXmu-devel libXext-devel
@@ -26,6 +27,7 @@
 # less is detected by configure, and substituted in GMT.in
 BuildRequires:  less
 Requires:       less
+Requires:       %{name}-common = %{version}-%{release}
 Requires:       GMT-coastlines
 Provides:       gmt = %{version}-%{release}
 
@@ -43,6 +45,18 @@
 Science Foundation.
 
 
+%package        common
+Summary:        Common files for %{name}
+Group:          Applications/Engineering
+Requires:       %{name} = %{version}-%{release}
+Provides:       gmt-common = %{version}-%{release}
+BuildArch:      noarch
+
+%description    common
+The %{name}-common package contains common files for GMT (Generic
+Mapping Tools) package.
+
+
 %package        devel
 Summary:        Development files for %{name}
 Group:          Development/Libraries
@@ -54,6 +68,20 @@
 developing applications that use %{name}.
 
 
+%package        doc
+Summary:        Documentation for %{name}
+Group:          Documentation
+Requires:       %{name} = %{version}-%{release}
+Provides:       gmt-doc = %{version}-%{release}
+Provides:       %{name}-examples = %{version}-%{release}
+Obsoletes:      %{name}-examples < %{version}-%{release}
+BuildArch:      noarch
+
+%description    doc
+The %{name}-doc package provides the documentation for the GMT (Generic
+Mapping Tools) package.
+
+
 %package        static
 Summary:        Static libraries for %{name}
 Group:          Development/Libraries
@@ -77,16 +105,6 @@
 applications that use %{name}.
 
 
-%package        examples
-Summary:        Generic Mapping Tools (Examples)
-Group:          Applications/Engineering
-Requires:       %{name} = %{version}-%{release}
-Provides:       gmt-examples = %{version}-%{release}
-
-%description    examples
-Example scripts for the Generic Mapping Tools.
-
-
 # X11 application in a subpackage. No .desktop file since it
 # requires a file name as argument
 %package -n      xgridedit
@@ -113,7 +131,7 @@
            --enable-shared \
            --enable-octave --enable-mex-mdir=%{octave_mdir} \
            --enable-mex-xdir=%{octave_octdir} \
-           --disable-rpath --enable-www=%{_docdir}/%{name}-%{version}
+           --disable-rpath
 make
 make suppl
 
@@ -131,11 +149,11 @@
   ln -s ../../../../../%{gmtconf}/$file $RPM_BUILD_ROOT%{gmthome}/$file
 done
 popd
-#Install examples
-cp -pr examples $RPM_BUILD_ROOT/%{gmthome}
+
 #Don't bring in csh for the csh examples
-find $RPM_BUILD_ROOT/%{gmthome}/examples -name \*.csh | 
+find $RPM_BUILD_ROOT/%{gmtdoc}/examples -name \*.csh | 
   xargs chmod a-x
+
 # separate the README files that are associated with gmt main package
 rm -rf __package_docs
 mkdir __package_docs
@@ -169,7 +187,14 @@
 
 %files
 %defattr(-,root,root,-)
-%doc README __package_docs/* COPYING ChangeLog www/gmt/doc/html gmt_bench-marks
+%doc README COPYING ChangeLog
+%{_bindir}/*
+%exclude %{_bindir}/xgridedit
+%{_libdir}/*.so.*
+
+%files common
+%defattr(-,root,root,-)
+%doc README __package_docs/* COPYING ChangeLog gmt_bench-marks
 %dir %{gmtconf}
 %dir %{gmtconf}/mgg
 %dir %{gmtconf}/dbase
@@ -179,12 +204,7 @@
 %config(noreplace) %{gmtconf}/mgg/gmtfile_paths
 %config(noreplace) %{gmtconf}/dbase/grdraster.info 
 %config(noreplace) %{gmtconf}/mgd77/mgd77_paths.txt
-%{_bindir}/*
-%exclude %{_bindir}/xgridedit
-%{_libdir}/*.so.*
-%dir %{gmthome}
-%{gmthome}/*
-%exclude %{gmthome}/examples
+%{gmthome}/
 %{_mandir}/man1/*.1*
 %{_mandir}/man5/*.5*
 
@@ -194,6 +214,10 @@
 %{_libdir}/*.so
 %{_mandir}/man3/*.3*
 
+%files doc
+%defattr(-,root,root,-)
+%{gmtdoc}/
+
 %files static
 %defattr(-,root,root,-)
 %{_libdir}/*.a
@@ -203,10 +227,6 @@
 %{octave_mdir}/*.m
 %{octave_octdir}/*.mex
 
-%files examples
-%defattr(-,root,root,-)
-%doc %{gmthome}/examples
-
 %files -n xgridedit
 %defattr(-,root,root,-)
 %doc src/xgrid/README.xgrid
@@ -214,6 +234,11 @@
 
 
 %changelog
+* Tue Feb 24 2009 Orion Poplawski <orion at cora.nwra.com> 4.4.0-1
+- Update to 4.4.0
+- Merge doc package into main package as noarch sub-packages
+- Merge examples sub-package into doc
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.3.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/GMT/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	21 May 2008 19:46:26 -0000	1.3
+++ sources	24 Feb 2009 20:15:54 -0000	1.4
@@ -1,4 +1,4 @@
-dec8b190c44faa9dc7a6eb512b9e7fd8  GMT4.3.1_scripts.tar.bz2
-f392f35e189e4c27742d23100bbba294  GMT4.3.1_share.tar.bz2
-43db0e2ab2ee48299832f04da4083cee  GMT4.3.1_src.tar.bz2
-c5d522d4b16a3d616898055046f5ecc9  GMT4.3.1_suppl.tar.bz2
+e37256c2c0e710a207d3788a84795ad5  GMT4.4.0_share.tar.bz2
+e5aa473a2bb93001942730f3da7c915f  GMT4.4.0_src.tar.bz2
+ca3c570645c4159a1f6c048ff8c2a7b1  GMT4.4.0_suppl.tar.bz2
+247e62f8468339b12d73f17dd5dbb0ad  GMT4.4.0_doc.tar.bz2


