rpms/frinika/F-13 frinika.spec,1.4,1.5

[Orcan Ogetbil]

Author: oget

Update of /cvs/pkgs/rpms/frinika/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv27167

Modified Files:
	frinika.spec 
Log Message:
* Mon May 31 2010 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.6.0-2
- Use apache-commons-logging instead of jakarta-commons-logging on Fedora > 13
- Add js.jar to classpath



Index: frinika.spec
===================================================================
RCS file: /cvs/pkgs/rpms/frinika/F-13/frinika.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- frinika.spec	18 Nov 2009 04:40:40 -0000	1.4
+++ frinika.spec	1 Jun 2010 01:30:44 -0000	1.5
@@ -1,8 +1,13 @@
 #%%global svnver 551
+%if 0%{?fedora} > 13
+%global commons_logging_pkg apache-commons-logging
+%else
+%global commons_logging_pkg jakarta-commons-logging
+%endif
 
 Name:             frinika
 Version:          0.6.0
-Release:          1%{?dist}
+Release:          2%{?dist}
 Summary:          Music Workstation
 Group:            Applications/Multimedia
 License:          GPLv2+
@@ -47,8 +52,8 @@ Requires:         jpackage-utils
 
 BuildRequires:    flexdock
 Requires:         flexdock
-BuildRequires:    jakarta-commons-logging
-Requires:         jakarta-commons-logging
+BuildRequires:    %{commons_logging_pkg}
+Requires:         %{commons_logging_pkg}
 BuildRequires:    jgoodies-looks
 Requires:         jgoodies-looks
 BuildRequires:    jjack
@@ -59,6 +64,8 @@ BuildRequires:    jVorbisEnc
 Requires:         jVorbisEnc
 BuildRequires:    RasmusDSP
 Requires:         RasmusDSP
+Buildrequires:    rhino
+Requires:         rhino
 BuildRequires:    SevenZip
 Requires:         SevenZip
 BuildRequires:    skinlf
@@ -129,7 +136,7 @@ ln -sf %{_prefix}/lib*/jjack/jjack.jar l
 ln -sf %{_prefix}/lib*/RasmusDSP/RasmusDSP.jar lib/
 ln -sf %{_prefix}/lib*/tootaudioservers/tootaudioservers.jar lib/
 ln -sf %{_prefix}/lib*/tritonus/tritonus_share.jar lib/
-build-jar-repository -s -p lib toot2 jmod jVorbisEnc jgoodies-looks jakarta-commons-logging skinlf SevenZip
+build-jar-repository -s -p lib toot2 jmod jVorbisEnc jgoodies-looks %{commons_logging_pkg} skinlf SevenZip js
 ant jar javadocs
 
 
@@ -188,6 +195,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon May 31 2010 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.6.0-2
+- Use apache-commons-logging instead of jakarta-commons-logging on Fedora > 13
+- Add js.jar to classpath
+
 * Tue Nov 17 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.6.0-1
 - Update to 0.6.0.