X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=java.spec;h=0ea9d7bd7669f608104cf98d97fb1bd3d0e8cb7a;hb=2f89de89a978d1a8bb6d369047a579ebda5e7854;hp=0e842322801a235e431063a92c474fd996c97351;hpb=57c7d1403b45c847375cfbf22a5bed8cc909be6a;p=projects%2Ftemplate-specs.git

diff --git a/java.spec b/java.spec
index 0e84232..0ea9d7b 100644
--- a/java.spec
+++ b/java.spec
@@ -1,22 +1,24 @@
 #
+# THIS IS TEMPLATE PACKAGE, CLEANUP UNUSED FRAGMENTS BEFORE SUBMITTING TO CVS
+#
 # Conditional build:
 %bcond_without	javadoc		# don't build javadoc
+%bcond_without	source		# don't build source jar
 %bcond_without	tests		# don't build and run tests
 
-%if "%{pld_release}" == "ti"
-%bcond_without	java_sun	# build with gcj
-%else
-%bcond_with	java_sun	# build with java-sun
-%endif
-#
-%include	/usr/lib/rpm/macros.java
+# To force building with specific JDK implementation
+# without replacing currently installed /usr/bin/javac, etc.
+#%%define	use_jdk	java-gcj-compat
+#%%buildrequires_jdk
+#BuildRequires:	rpmbuild(macros) >= 1.556
 
 # Name without java- prefix. If it is application, not a library,
 # just do s/srcname/name/g
 %define		srcname		-
+%include	/usr/lib/rpm/macros.java
 Summary:	-
 Summary(pl.UTF-8):	-
-Name:		-
+Name:		java-%{srcname}
 Version:	-
 Release:	0.1
 License:	-
@@ -27,17 +29,18 @@ Group:		Libraries/Java
 Source0:	-
 # Source0-md5:	-
 URL:		-
+# this is needed for the LC_ALL=en_US in build part dependency
 %if %(locale -a | grep -q '^en_US$'; echo $?)
 BuildRequires:	glibc-localedb-all
 %endif
-%{!?with_java_sun:BuildRequires:	java-gcj-compat-devel}
-%{?with_java_sun:BuildRequires:	java-sun}
 BuildRequires:	jpackage-utils
-BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.300
 # for %%undos macro
 BuildRequires:	rpmbuild(macros) >= 1.553
+%if %{with source}
+BuildRequires:	rpmbuild(macros) >= 1.555
+%endif
 BuildRequires:	sed >= 4.0
 # for %{_javadir}
 Requires:	jpackage-utils
@@ -54,6 +57,10 @@ Summary(fr.UTF-8):	Documentation pour %{srcname}
 Summary(it.UTF-8):	Documentazione di %{srcname}
 Summary(pl.UTF-8):	Podręcznik dla %{srcname}
 Group:		Documentation
+# noarch subpackages only when building with rpm5
+%if "%{_rpmversion}" >= "5"
+BuildArch:	noarch
+%endif
 
 %description doc
 Documentation for %{srcname}.
@@ -101,6 +108,18 @@ Group:		Documentation
 %description manual
 Manual for %{srcname}.
 
+%package source
+Summary:	Source code of %{srcname}
+Summary(pl.UTF-8):	Kod źródłowy %{srcname}
+Group:		Documentation
+Requires:	jpackage-utils >= 1.7.5-2
+
+%description source
+Source code of %{srcname}.
+
+%description source -l pl.UTF-8
+Kod źródłowy %{srcname}.
+
 %prep
 %setup -q -n %{srcname}-%{version}
 #%%undos build.xml
@@ -112,28 +131,34 @@ required_jars="jaxp_parser_impl"
 CLASSPATH=$(build-classpath $required_jars)
 export CLASSPATH
 
-export LC_ALL=en_US # source code not US-ASCII
+# source code not US-ASCII
+export LC_ALL=en_US
 
 %ant
 
 %{__make}
 
+# if you need to assemble .jar yourself
 cd src
 %javac -cp $CLASSPATH $(find -name '*.java')
 %jar cf ../%{srcname}.jar $(find -name '*.class')
+%if %{with source}
+%jar cf ../%{srcname}.src.jar $(find -name '*.java')
+%endif
+cd ..
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_javadir}
 
 # jars
-cp -a dist/%{srcname}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}-%{version}.jar
+install -d $RPM_BUILD_ROOT%{_javadir}
+cp -p dist/%{srcname}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}-%{version}.jar
 ln -s %{srcname}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}.jar
 
 # for jakarta packages:
 for a in dist/*.jar; do
 	jar=${a##*/}
-	cp -a dist/$jar $RPM_BUILD_ROOT%{_javadir}/${jar%%.jar}-%{version}.jar
+	cp -p dist/$jar $RPM_BUILD_ROOT%{_javadir}/${jar%%.jar}-%{version}.jar
 	ln -s ${jar%%.jar}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/$jar
 done
 
@@ -148,6 +173,10 @@ ln -s %{srcname}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{srcname} # ghost sym
 install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 cp -a demo/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
+# source
+install -d $RPM_BUILD_ROOT%{_javasrcdir}
+cp -a %{srcname}.src.jar $RPM_BUILD_ROOT%{_javasrcdir}/%{srcname}.src.jar
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -156,8 +185,8 @@ ln -nfs %{srcname}-%{version} %{_javadocdir}/%{srcname}
 
 %files
 %defattr(644,root,root,755)
-%{_javadir}/%{srcname}.jar
 %{_javadir}/%{srcname}-%{version}.jar
+%{_javadir}/%{srcname}.jar
 
 %files doc
 %defattr(644,root,root,755)
@@ -175,3 +204,9 @@ ln -nfs %{srcname}-%{version} %{_javadocdir}/%{srcname}
 %{_javadocdir}/%{srcname}-%{version}
 %ghost %{_javadocdir}/%{srcname}
 %endif
+
+%if %{with source}
+%files source
+%defattr(644,root,root,755)
+%{_javasrcdir}/%{srcname}.src.jar
+%endif