rpms/opticalraytracer/F-12 opticalraytracer.spec, 1.5, 1.6 sources, 1.3, 1.4

[Miloš Jakubíček]

Author: mjakubicek

Update of /cvs/pkgs/rpms/opticalraytracer/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21558/F-12

Modified Files:
	opticalraytracer.spec sources 
Log Message:
 - Update to 2.7: now a Java application



Index: opticalraytracer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/opticalraytracer/F-12/opticalraytracer.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- opticalraytracer.spec	25 Jul 2009 20:57:54 -0000	1.5
+++ opticalraytracer.spec	7 Jan 2010 12:53:22 -0000	1.6
@@ -1,23 +1,25 @@
 Name:		opticalraytracer
-Version:	1.2    
-Release:	4%{?dist}
+Version:	2.7
+Release:	1%{?dist}
 Summary:	Utility that analyzes systems of lenses
 
 Group:		Amusements/Graphics    
-License:	GPLv2+    
+License:	GPLv2+	  
 URL:		http://arachnoid.com/OpticalRayTracer/index.html
-Source0:	http://arachnoid.com/OpticalRayTracer/raytracer.tar.bz2
+Source0:	http://arachnoid.com/OpticalRayTracer/OpticalRayTracer_source.tar.gz
 Source1:	%{name}.desktop
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch:	noarch
 
-BuildRequires:	autoconf
-BuildRequires:	automake16
-BuildRequires:	libXext-devel
-BuildRequires:	zlib-devel
-BuildRequires:	libjpeg-devel
-BuildRequires:	qt3-devel
-BuildRequires:	kdebase3-devel
 BuildRequires:	desktop-file-utils
+BuildRequires:	java-1.6.0-openjdk-devel
+BuildRequires:	java-devel
+BuildRequires:	jpackage-utils
+BuildRequires:	ant
+BuildRequires:	ant-junit
+
+Requires:	java
+Requires:	jpackage-utils
 
 %description
 OpticalRayTracer is a X Window GUI-based utility that analyzes systems of 
@@ -28,31 +30,48 @@ OpticalRayTracer includes an advanced, e
 user to rearrange the optical configuration by simply dragging lenses around 
 using the mouse.
 
+%package javadoc
+Summary:		Javadocs for %{name}
+Group:			Documentation
+Requires:		%{name} = %{version}-%{release}
+Requires:		jpackage-utils
+
+%description javadoc
+This package contains the API documentation for %{name}.
+
 %prep
-%setup -q -n raytracer
+%setup -q -c
 
 %build
-# honor $RPM_OPT_FLAGS
-sed -i 's|CXXFLAGS="$ac_save_CXXFLAGS"|CXXFLAGS="$RPM_OPT_FLAGS"|' configure
-%configure --disable-rpath
-make %{?_smp_mflags}
+ant 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
 
 desktop-file-install --vendor="fedora" \
 --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
 %{SOURCE1}
 
-install -D -p -m644 src/OpticalRayTracer.png \
+install -D -p -m644 src/opticalraytracer/icons/OpticalRayTracer.png \
 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/OpticalRayTracer.png
 
-# do not use absolute symlinks
-rm $RPM_BUILD_ROOT%{_docdir}/HTML/en/raytracer/common
-pushd $RPM_BUILD_ROOT%{_docdir}/HTML/en/raytracer
-	ln -s ../common
-popd
+mkdir -p $RPM_BUILD_ROOT%{_bindir}
+cat > $RPM_BUILD_ROOT%{_bindir}/raytracer <<-EOF
+	#!/bin/bash
+	. /usr/share/java-utils/java-functions
+	MAIN_CLASS=opticalraytracer.OpticalRayTracer
+	set_classpath "%{name}-%{version}"
+	run "$@"
+EOF
+chmod a+x $RPM_BUILD_ROOT%{_bindir}/raytracer
+
+mkdir -p $RPM_BUILD_ROOT%{_javadir}
+cp -p dist/OpticalRayTracer.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+
+
+mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -rp dist/javadoc $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -71,14 +90,21 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING AUTHORS
+%{_javadir}/*
 %{_bindir}/raytracer
-%{_datadir}/apps/raytracer/
 %{_datadir}/applications/fedora-opticalraytracer.desktop
 %{_datadir}/icons/hicolor/32x32/apps/OpticalRayTracer.png
-%{_docdir}/HTML/en/raytracer/
+%doc src/opticalraytracer/help_resources/*
+
+%files javadoc
+%defattr(-,root,root,-)
+%{_javadocdir}/%{name}
+
 
 %changelog
+* Thu Jan 07 2010 Milos Jakubicek <xjakub at fi.muni.cz> - 2.7-1
+- Update to 2.7: now a Java application
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/opticalraytracer/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	22 Feb 2009 10:35:31 -0000	1.3
+++ sources	7 Jan 2010 12:53:22 -0000	1.4
@@ -1 +1 @@
-cf15819fef6eb74bc033707267c9b40a  raytracer.tar.bz2
+bc1c54d300f6542ead427bdede9d7bb0  OpticalRayTracer_source.tar.gz