packages: jira-enterprise/jira-enterprise.spec - asterisk in symlink creati...

[pawelz]

Author: pawelz                       Date: Sun Nov 22 00:33:04 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- asterisk in symlink creation in install section was expanded against
  /usr/share/... instead of $RPM_BUILD_ROOT/usr/share/..., so rpm was broken
  if jira had not been installed before.

---- Files affected:
packages/jira-enterprise:
   jira-enterprise.spec (1.24 -> 1.25) 

---- Diffs:

================================================================
Index: packages/jira-enterprise/jira-enterprise.spec
diff -u packages/jira-enterprise/jira-enterprise.spec:1.24 packages/jira-enterprise/jira-enterprise.spec:1.25
--- packages/jira-enterprise/jira-enterprise.spec:1.24	Mon Nov 16 12:37:32 2009
+++ packages/jira-enterprise/jira-enterprise.spec	Sun Nov 22 01:32:59 2009
@@ -27,8 +27,8 @@
 BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.300
 Requires:	jpackage-utils
-Requires:	tomcat >= 0:6.0.20-4
 Requires:	jre-X11
+Requires:	tomcat >= 0:6.0.20-4
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -75,7 +75,8 @@
 # some additional libraries
 install -d $RPM_BUILD_ROOT%{_datadir}/tomcat/lib
 cp -a jira-jars-tomcat5/* $RPM_BUILD_ROOT%{_datadir}/jira/WEB-INF/lib
-ln -s %{_datadir}/jira/WEB-INF/lib/hsqldb-*.jar $RPM_BUILD_ROOT%{_datadir}/tomcat/lib/hsqldb.jar
+hsqldbfilename=$(basename $(ls $RPM_BUILD_ROOT%{_datadir}/jira/WEB-INF/lib/hsql*jar))
+ln -s %{_datadir}/jira/WEB-INF/lib/$hsqldbfilename $RPM_BUILD_ROOT%{_datadir}/tomcat/lib/hsqldb.jar
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -107,6 +108,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.25  2009/11/22 00:32:59  pawelz
+- asterisk in symlink creation in install section was expanded against
+  /usr/share/... instead of $RPM_BUILD_ROOT/usr/share/..., so rpm was broken
+  if jira had not been installed before.
+
 Revision 1.24  2009/11/16 11:37:32  pawelz
 - R: jre-X11 because of font. Maybe we should split java fonts into
   subpackage?
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/jira-enterprise/jira-enterprise.spec?r1=1.24&r2=1.25&f=u