packages: java-slf4j/java-slf4j.spec - builds and seems to work

[pawelz]

Author: pawelz                       Date: Mon Sep 21 22:25:43 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- builds and seems to work

---- Files affected:
packages/java-slf4j:
   java-slf4j.spec (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/java-slf4j/java-slf4j.spec
diff -u packages/java-slf4j/java-slf4j.spec:1.1 packages/java-slf4j/java-slf4j.spec:1.2
--- packages/java-slf4j/java-slf4j.spec:1.1	Mon Sep 21 00:27:23 2009
+++ packages/java-slf4j/java-slf4j.spec	Tue Sep 22 00:25:37 2009
@@ -1,8 +1,8 @@
 # $Revision$, $Date$
-#
-# Conditional build:
-%bcond_without	javadoc		# don't build javadoc
-%bcond_without	tests		# don't build and run tests
+# TODO:
+# - javadocs?
+# - tests?
+# - split into subpackages?
 
 %if "%{pld_release}" == "ti"
 %bcond_without	java_sun	# build with gcj
@@ -21,7 +21,7 @@
 Group:		Libraries/Java
 Source0:	http://xatka.net/~z/PLD/slf4j-1.5.8.tar.bz2
 # Source0-md5:	841e16c3d5d5a323ceabfc6bdce10bb8
-Source1:	%{name}-build.xml
+Source1:	%{name}-genbuildxml.sh
 URL:		http://www.slf4j.org/
 %{!?with_java_sun:BuildRequires:	java-gcj-compat-devel}
 %{?with_java_sun:BuildRequires:	java-sun}
@@ -43,73 +43,22 @@
 logback, allowing the end user to plug in the desired logging framework at
 deployment time.
 
-%package doc
-Summary:	Manual for %{name}
-Summary(fr.UTF-8):	Documentation pour %{name}
-Summary(it.UTF-8):	Documentazione di %{name}
-Summary(pl.UTF-8):	Podręcznik dla %{name}
-Group:		Documentation
-
-%description doc
-Documentation for %{name}.
-
-%description doc -l fr.UTF-8
-Documentation pour %{name}.
-
-%description doc -l it.UTF-8
-Documentazione di %{name}.
-
-%description doc -l pl.UTF-8
-Dokumentacja do %{name}.
-
-%package javadoc
-Summary:	Online manual for %{name}
-Summary(pl.UTF-8):	Dokumentacja online do %{name}
-Group:		Documentation
-Requires:	jpackage-utils
-
-%description javadoc
-Documentation for %{name}.
-
-%description javadoc -l pl.UTF-8
-Dokumentacja do %{name}.
-
-%description javadoc -l fr.UTF-8
-Javadoc pour %{name}.
-
-%package demo
-Summary:	Demo for %{name}
-Summary(pl.UTF-8):	Pliki demonstracyjne dla pakietu %{name}
-Group:		Documentation
-Requires:	%{name} = %{epoch}:%{version}-%{release}
-
-%description demo
-Demonstrations and samples for %{name}.
-
-%description demo -l pl.UTF-8
-Pliki demonstracyjne i przykłady dla pakietu %{name}.
-
-%package manual
-Summary:	Tutorial for %{name}
-Group:		Documentation
-
-%description manual
-Manual for %{name}.
-
 %prep
 %setup -q -n %{srcname}-%{version}
-cp %{SOURCE1} build.xml
+
+find -name MANIFEST.MF | xargs sed -i 's,${project.version},%{version},g'
+
+# break build if any macro is left
+find -name MANIFEST.MF | ! xargs grep '\${'
 
 %build
 
 export JAVA_HOME="%{java_home}"
 
-# required_jars="jaxp_parser_impl"
-# CLASSPATH=$(build-classpath $required_jars)
-# export CLASSPATH
-
 export LC_ALL=en_US # source code not US-ASCII
 
+sh %{SOURCE1} > build.xml
+
 javassist_jar=$(find-jar javassist)
 commons_logging_jar=$(find-jar commons-logging-api)
 commons_lang_jar=$(find-jar commons-lang)
@@ -126,47 +75,28 @@
 install -d $RPM_BUILD_ROOT%{_javadir}
 
 # jars
-cp -a dist/%{srcname}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}-%{version}.jar
-ln -s %{srcname}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}.jar
-
-# javadoc
-%if %{with javadoc}
-install -d $RPM_BUILD_ROOT%{_javadocdir}/%{srcname}-%{version}
-cp -a dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{srcname}-%{version}
-ln -s %{srcname}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{srcname} # ghost symlink
-%endif
-
-# demo
-install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
-cp -a demo/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+for j in dist/*.jar; do
+  n=$(basename $j .jar)
+  cp -a $j $RPM_BUILD_ROOT%{_javadir}/$n-%{version}.jar
+  ln -s $n-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/$n.jar
+done
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post javadoc
-ln -nfs %{srcname}-%{version} %{_javadocdir}/%{srcname}
-
 %files
 %defattr(644,root,root,755)
 %{_javadir}/*.jar
 
-%files doc
-%defattr(644,root,root,755)
-%doc docs/*
-
-%if %{with javadoc}
-%files javadoc
-%defattr(644,root,root,755)
-%{_javadocdir}/%{srcname}-%{version}
-%ghost %{_javadocdir}/%{srcname}
-%endif
-
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2009/09/21 22:25:37  pawelz
+- builds and seems to work
+
 Revision 1.1  2009/09/20 22:27:23  pawelz
 - initial, NFY.
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-slf4j/java-slf4j.spec?r1=1.1&r2=1.2&f=u