Author: peroyvind
Date: Fri Feb 2 23:58:03 2007
New Revision: 116001
Modified:
packages/cooker/cdqa/current/SPECS/cdqa.spec
Log:
be sure to use actual snapshot date as version rather than current date
misc packaging fixes
Modified: packages/cooker/cdqa/current/SPECS/cdqa.spec
==============================================================================
--- packages/cooker/cdqa/current/SPECS/cdqa.spec (original)
+++ packages/cooker/cdqa/current/SPECS/cdqa.spec Fri Feb 2 23:58:03 2007
@@ -1,47 +1,55 @@
%define name cdqa
+%define oname CDQA
+%define jarname cdqa
%define version 20070201
%define release %mkrel 1
+%define jarlibs axis gemo-utilities gnu.regexp
Name: %{name}
Version: %{version}
Release: %{release}
-Summary: CDQA
+Summary: %{oname}
License: LGPL
Group: Development/Java
Url: http://forge.objectweb.org/projects/activexml/
# from cvs
Source0: %{name}-%{version}.tar.lzma
BuildRequires: lzma
-BuildRequires: jpackage-utils java-devel ant axis gemo-utilities gnu.regexp
+BuildRequires: jpackage-utils java-devel ant %{jarlibs}
+Requires: %{jarlibs}
+Provides: %{oname} = %{version}-%{release}
Buildarch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
%description
-CDQA
+%{oname}
%package javadoc
-Summary: Javadoc for %{name}
+Summary: Javadoc for %{oname}
Group: Development/Java
%description javadoc
-Javadoc for %{name}.
+Javadoc for %{oname}.
%prep
-%setup -q -n CDQA
+%setup -q -n %{oname}
#make sure that we don't use precompiled java package if shipped
-rm -f lib
+rm -rf lib
%build
-export CLASSPATH=$(build-classpath axis gemo-utilities gnu.regexp)
-ant -f cdqa_build.xml jar javadoc
-jar -i build/lib/%{name}.jar
+CLASSPATH=$(build-classpath %{jarlibs}) \
+ant -f cdqa_build.xml jar javadoc -DDSTAMP=%{version}
+jar -i build/lib/%{jarname}.jar
%install
rm -rf %{buildroot}
install -d %{buildroot}%{_javadir}
-install -m644 build/lib/%{name}.jar -D
%{buildroot}%{_javadir}/%{name}-%{version}.jar
-ln -s %{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
+install -m644 build/lib/%{jarname}.jar -D
%{buildroot}%{_javadir}/%{jarname}-%{version}.jar
+for jarname in \
+ %{buildroot}%{_javadir}/%{oname}{,-%{version}}.jar
+do ln -s %{jarname}-%{version}.jar $jarname
+done
install -d %{buildroot}%{_javadocdir}/%{name}-%{version}
cp -r build/api %{buildroot}%{_javadocdir}/%{name}-%{version}
