rpms/cloudy/devel .cvsignore, 1.2, 1.3 cloudy-shared.patch, 1.1, 1.2 cloudy.spec, 1.9, 1.10 sources, 1.3, 1.4

Sergio Pascual sergiopr at fedoraproject.org
Sun Apr 4 22:08:29 UTC 2010 

Author: sergiopr

Update of /cvs/pkgs/rpms/cloudy/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv20049

Modified Files:
	.cvsignore cloudy-shared.patch cloudy.spec sources 
Log Message:
* Sun Apr 04 2010 Sergio Pascual <sergiopr at fedoraproject.org> - 08.00-1
- New upstream source
- Devel documentations in its own subpackage devel-doc
- Program documentation in doc subpackage (bz #492431)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cloudy/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	23 Feb 2008 22:36:52 -0000	1.2
+++ .cvsignore	4 Apr 2010 22:08:28 -0000	1.3
@@ -1 +1,2 @@
-cloudy_v07_02_01.tar.gz
+c08.00.tar.gz
+cloudy_no_date_footer.tar.gz

cloudy-shared.patch:
 Makefile |   22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

Index: cloudy-shared.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cloudy/devel/cloudy-shared.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- cloudy-shared.patch	23 Feb 2008 22:36:52 -0000	1.1
+++ cloudy-shared.patch	4 Apr 2010 22:08:28 -0000	1.2
@@ -1,47 +1,63 @@
-diff -ur c07.02.01/source/Makefile c07.02.01.new/source/Makefile
---- c07.02.01/source/Makefile	2007-07-09 04:28:29.000000000 +0200
-+++ c07.02.01.new/source/Makefile	2008-02-14 11:31:59.000000000 +0100
-@@ -1,15 +1,17 @@
- # Makefile for compiling Cloudy on a g++ platform
- # This works only with GNU make!
+diff -ur c08.00/source/Makefile c08.00.new/source/Makefile
+--- c08.00/source/Makefile	2008-08-18 13:05:17.000000000 +0200
++++ c08.00.new/source/Makefile	2010-04-02 00:59:09.000000000 +0200
+@@ -3,11 +3,11 @@
+ # you need g++ or pathCC to create Makefile.dep (set with CXXDEPEND)
+ # but after that you can use any compiler you want (set with CXX)
  
+-OPT = -O3 -ftrapping-math -fno-math-errno
 -CXX = g++
--CXXFLAGS = -ansi -g -O3 -Wall
--LDLIBS = -lm
-+
-+
-+
- .PHONY: clean distclean depend
- 
- # this is a filter to erase optimization flags from CXXFLAGS
- OPTFILTER = -O -O1 -O2 -O3 -O4 -O5 -Os -xO -xO1 -xO2 -xO3 -xO4 -xO5 -fast
- 
- CXXFLAGSNOOPT = ${filter-out ${OPTFILTER},${CXXFLAGS}}
-+CXXNOLIBFLAGS := ${CXXFLAGS}
-+CXXFLAGS = -fPIC -DPIC $(CXXNOLIBFLAGS)
+-CXXFLAGS = -ansi ${OPT} -Wall -g
+-LDFLAGS = ${OPT} -Wall -g
+-LDLIBS=
++#OPT = -O3 -ftrapping-math -fno-math-errno
++#CXX = g++
++#CXXFLAGS = -ansi ${OPT} -Wall -g
++#LDFLAGS = ${OPT} -Wall -g
++#LDLIBS=
+ SRCDIR=.
  
  main := maincl.cpp
- source := ${wildcard *.cpp}
-@@ -31,16 +33,20 @@
-   CDP = $(shell pwd)/../data/
+@@ -15,7 +15,7 @@
+ libsource := ${filter-out ${main},${source}}
+ includes := ${notdir ${wildcard ${SRCDIR}/*.h}}
+ objects := ${source:.cpp=.o}
+-libobjects := ${libsource:.cpp=.o}
++libobjects := ${libsource:.cpp=.lo}
+ 
+ # include a configuration file if one exists (or carry on without
+ # worrying if it doesn't)
+@@ -81,18 +81,22 @@
+ 	LDLIBS += -L${CLOUDY_LAPACK_PATH}/lib -llapack
  endif
  
--cloudy.exe : maincl.o libcloudy.a
--	${CXX} ${CXXFLAGS} ${LDFLAGS} -o cloudy.exe maincl.o libcloudy.a ${LDLIBS}
-+cloudy.exe : maincl.cpp libcloudy.so
-+	${CXX} ${CXXNOLIBFLAGS} ${LDFLAGS} -o cloudy.exe maincl.cpp -L. -lcloudy ${LDLIBS}
+-cloudy.exe : ${preobjects} maincl.o libcloudy.a
++cloudy.exe : ${preobjects} maincl.o libcloudy.so
+ 	${CXX} ${LDFLAGS} -o cloudy.exe maincl.o -L. -lcloudy ${LDLIBS}
  
  libcloudy.a: ${libobjects}
  	ar ru libcloudy.a ${libobjects}
  	${RANLIB} libcloudy.a
  
 +libcloudy.so: ${libobjects}
-+	${CXX} ${CXXFLAGS} -shared -o libcloudy.so.0 -Wl,-soname,libcloudy.so.0 ${libobjects} ${LDFLAGS}
++	${CXX} -shared -o libcloudy.so.0 -Wl,-soname,libcloudy.so.0 ${libobjects} ${LDFLAGS}
 +	ln -s libcloudy.so.0 libcloudy.so
++
  clean :
  	rm -f *.o
- 	rm -f libcloudy.a
-+	rm -f libcloudy.so*
+ 	rm -f *.h.gch
+ 	rm -rf SunWS_cache
+-	rm -f libcloudy.a
++	rm -f libcloudy.*
  	rm -f cloudy.exe
  
  distclean :
+@@ -121,6 +125,8 @@
+ %.h.gch: %.h
+ 	${CXX} ${CXXFLAGS} -o $@ $<
+ 
++%.lo: %.cpp
++	${CXX} ${CXXFLAGS} -fPIC -DPIC -c -o $@ $<
+ # only include Makefile.dep when we really need it, this prevents unnecessary builds of Makefile.dep
+ ifneq (${DEP_GOALS},)
+ -include Makefile.dep


Index: cloudy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cloudy/devel/cloudy.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- cloudy.spec	24 Jul 2009 19:07:32 -0000	1.9
+++ cloudy.spec	4 Apr 2010 22:08:28 -0000	1.10
@@ -1,18 +1,17 @@
 Name: cloudy
-Version: 07.02.01
-Release: 7%{?dist}
+Version: 08.00
+Release: 1%{?dist}
 Summary: Spectral synthesis code to simulate conditions in interstellar matter
 
-%define upversion 07_02_01
+%define upversion 08.00
 
 Group: Applications/Engineering
 License: BSD
 URL: http://www.nublado.org/
-Source0: ftp://gradj.pa.uky.edu/gary/cloudy_gold/%{name}_v%{upversion}.tar.gz
+Source0: ftp://gradj.pa.uky.edu/gary/cloudy_gold/c%{upversion}.tar.gz
 Source1: cloudy_no_date_footer.tar.gz
 Patch0: cloudy-doxygen.patch
 Patch1: cloudy-shared.patch
-Patch2: cloudy-hotfixes-20080214.patch
 Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 Requires: %{name}-libs = %{version}-%{release}
@@ -45,27 +44,37 @@ Summary: Cloudy runtime libraries
 Group: System Environment/Libraries
 %description libs
 Cloudy is a Spectral synthesis code to simulate conditions in 
-interstellar matter.  This package contains the %{name} run-time library
+interstellar matter. This package contains the %{name} run-time library
 
-%package docs
-Summary: Documentation for %{name}, includes full API docs
+%package doc
+Summary: Documentation for %{name}
 Group: Documentation
 BuildArch: noarch
  
-%description docs
-This package contains the full API documentation for %{name}.
+%description doc
+This package contains the usage documentation for %{name}.
+
+%package devel-doc
+Summary: Developer documentation for %{name}
+Group: Documentation
+BuildArch: noarch
+Obsoletes: cloudy-docs < 08.00-1
+Provides: cloudy-docs = %{version}-%{release}
+ 
+%description devel-doc
+Developer documentation for %{name}
 
 %prep
 %setup -q -n c%{version}
 %setup -q -n c%{version} -T -D -a 1
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
+chmod +x source/precompile.pl
 
 %build
 cd source
-CXX="%{__cxx}" CXXFLAGS="%{optflags}" CLOUDY_DATA_PATH=%{_datadir}/%{name}/data/ \
-%{__make} %{?_smp_mflags}
+make %{?_smp_mflags} CXX="%{__cxx}" CXXFLAGS="%{optflags}" \
+    CLOUDY_DATA_PATH=%{_datadir}/%{name}/data/
 cd ..
 cd doxygen
 doxygen Doxyfile
@@ -75,25 +84,25 @@ find -empty -exec rm '{}' ';'
 find -name installdox -exec rm '{}' ';'
 
 %install
-%{__rm} -fr %{buildroot}
-%{__mkdir_p} %{buildroot}/%{_bindir}
-%{__mkdir_p} %{buildroot}/%{_libdir}
-%{__mkdir_p} %{buildroot}/%{_includedir}/%{name}
-%{__mkdir_p} %{buildroot}/%{_datadir}/%{name}/data
-%{__mkdir_p} %{buildroot}/%{_datadir}/%{name}/scripts
-%{__mkdir_p} %{buildroot}/%{_datadir}/%{name}/grain
-%{__install} -m 755 source/cloudy.exe %{buildroot}/%{_bindir}/cloudy
-%{__install} -m 755 source/libcloudy.so.* %{buildroot}/%{_libdir}
-%{__cp} -a source/libcloudy.so %{buildroot}/%{_libdir}
-%{__cp} -a source/cddefines.h %{buildroot}/%{_includedir}/%{name}
-%{__cp} -a source/cpu.h %{buildroot}/%{_includedir}/%{name}
-%{__cp} -a source/cddrive.h %{buildroot}/%{_includedir}/%{name}
-%{__cp} -a data/*.opc %{buildroot}/%{_datadir}/%{name}/data
-%{__cp} -a data/*.ini %{buildroot}/%{_datadir}/%{name}/data
-%{__cp} -a data/*.dat %{buildroot}/%{_datadir}/%{name}/data
-%{__cp} -a data/*.rfi %{buildroot}/%{_datadir}/%{name}/grain
-%{__cp} -a data/*.szd %{buildroot}/%{_datadir}/%{name}/grain
-%{__cp} -a data/*.in %{buildroot}/%{_datadir}/%{name}/scripts
+rm -rf %{buildroot}
+mkdir -p %{buildroot}/%{_bindir}
+mkdir -p %{buildroot}/%{_libdir}
+mkdir -p %{buildroot}/%{_includedir}/%{name}
+mkdir -p %{buildroot}/%{_datadir}/%{name}/data
+mkdir -p %{buildroot}/%{_datadir}/%{name}/scripts
+mkdir -p %{buildroot}/%{_datadir}/%{name}/grain
+install -m 755 source/cloudy.exe %{buildroot}/%{_bindir}/cloudy
+install -m 755 source/libcloudy.so.* %{buildroot}/%{_libdir}
+cp -a source/libcloudy.so %{buildroot}/%{_libdir}
+cp -a source/cddefines.h %{buildroot}/%{_includedir}/%{name}
+cp -a source/cpu.h %{buildroot}/%{_includedir}/%{name}
+cp -a source/cddrive.h %{buildroot}/%{_includedir}/%{name}
+cp -a data/*.opc %{buildroot}/%{_datadir}/%{name}/data
+cp -a data/*.ini %{buildroot}/%{_datadir}/%{name}/data
+cp -a data/*.dat %{buildroot}/%{_datadir}/%{name}/data
+cp -a data/*.rfi %{buildroot}/%{_datadir}/%{name}/grain
+cp -a data/*.szd %{buildroot}/%{_datadir}/%{name}/grain
+cp -a data/*.in %{buildroot}/%{_datadir}/%{name}/scripts
 
 %clean
 %{__rm} -fr %{buildroot}
@@ -107,6 +116,10 @@ find -name installdox -exec rm '{}' ';'
 %doc license.txt readme.txt docs/* 
 %{_bindir}/*
 
+%files doc
+%defattr(-,root,root,-)
+%doc docs/* 
+
 %files libs
 %defattr(-,root,root,-)
 %doc license.txt data/readme_data.htm data/readme_LineList_dat.txt
@@ -119,31 +132,36 @@ find -name installdox -exec rm '{}' ';'
 %{_includedir}/%{name}
 %{_libdir}/lib%{name}.so
 
-%files docs
+%files devel-doc
 %defattr(-,root,root,-)
 %doc doxygen/html
 
 %changelog
+* Sun Apr 04 2010 Sergio Pascual <sergiopr at fedoraproject.org> - 08.00-1
+- New upstream source
+- Devel documentations in its own subpackage devel-doc
+- Program documentation in doc subpackage (bz #492431)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 07.02.01-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
-* Tue Jun 16 2009 Sergio Pascual <sergiopr at fedoraproject.org> 07.02.01-7
+* Tue Jun 16 2009 Sergio Pascual <sergiopr at fedoraproject.org> - 07.02.01-7
 - Noarch subpackage for docs
 
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 07.02.01-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
-* Mon Dec 01 2008 Sergio Pascual <sergiopr at fedoraproject.org> 07.02.01-5
+* Mon Dec 01 2008 Sergio Pascual <sergiopr at fedoraproject.org> - 07.02.01-5
 - Directory not owned by package (bz #473639)
 
-* Thu Mar 27 2008 Sergio Pascual <sergiopr at fedoraproject.org> 07.02.01-4
+* Thu Mar 27 2008 Sergio Pascual <sergiopr at fedoraproject.org> - 07.02.01-4
 - Timestamps in footer of doxygen docs removed (bz #436495)
 
-* Thu Mar 27 2008 Sergio Pascual <sergiopr at fedoraproject.org> 07.02.01-3
+* Thu Mar 27 2008 Sergio Pascual <sergiopr at fedoraproject.org> - 07.02.01-3
 - Docs package is noarch (reverted)
 
-* Sat Feb 24 2008 Sergio Pascual <sergiopr at fedoraproject.org> 07.02.01-2
+* Sat Feb 24 2008 Sergio Pascual <sergiopr at fedoraproject.org> - 07.02.01-2
 - Too much files in docs
 
-* Thu Feb 14 2008 Sergio Pascual <sergiopr at fedoraproject.org> 07.02.01-1
+* Thu Feb 14 2008 Sergio Pascual <sergiopr at fedoraproject.org> - 07.02.01-1
 - Initial specfile


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cloudy/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	27 Mar 2008 12:44:58 -0000	1.3
+++ sources	4 Apr 2010 22:08:28 -0000	1.4
@@ -1,2 +1,2 @@
+d1488735de2eba1a347de03015c3fa9f  c08.00.tar.gz
 98ac4a08813e89789bda1ab0c2dbb6b0  cloudy_no_date_footer.tar.gz
-a3fac860aad241da9bc21b5a37f6c8cb  cloudy_v07_02_01.tar.gz

More information about the scm-commits mailing list