packages: moviejukebox/moviejukebox.spec - simplify shell wrapper, cosmetics

glen glen at pld-linux.org
Mon Dec 7 11:51:46 CET 2009


Author: glen                         Date: Mon Dec  7 10:51:46 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- simplify shell wrapper, cosmetics

---- Files affected:
packages/moviejukebox:
   moviejukebox.spec (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: packages/moviejukebox/moviejukebox.spec
diff -u packages/moviejukebox/moviejukebox.spec:1.2 packages/moviejukebox/moviejukebox.spec:1.3
--- packages/moviejukebox/moviejukebox.spec:1.2	Mon Dec  7 09:47:12 2009
+++ packages/moviejukebox/moviejukebox.spec	Mon Dec  7 11:51:40 2009
@@ -31,33 +31,26 @@
 %prep
 %setup -qn %{name}-r%{svnrev}
 
-cat > moviejukebox.sh << EOF
+cat > moviejukebox.sh <<'EOF'
 #!/bin/sh
 . %{_datadir}/java-utils/java-functions
-mkdir -p \$HOME/.moviejukebox
-CLASSPATH=\$HOME/.moviejukebox:%{_datadir}/%{name}:\$(build-classpath-directory %{_javadir}/%{name})
+mkdir -p $HOME/.moviejukebox
+CLASSPATH=$HOME/.moviejukebox:%{_datadir}/%{name}:$(build-classpath-directory %{_javadir}/%{name})
 set_javacmd
-\$JAVACMD -Xms256m -Xmx512m -cp \$CLASSPATH com.moviejukebox.MovieJukebox "\$@"
+exec $JAVACMD -Xms256m -Xmx512m -cp $CLASSPATH com.moviejukebox.MovieJukebox "$@"
 EOF
 
-chmod a+x %{name}.sh
-
 %build
-
 CLASSPATH=$(build-classpath commons-lang commons-collections commons-logging junit)
-
 %ant -Dbuild.sysclasspath=first
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_javadir}
-install -d $RPM_BUILD_ROOT%{_datadir}/%{name}
-install -d $RPM_BUILD_ROOT%{_bindir}
-
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_javadir},%{_datadir}/%{name}}
 cp -a dist/lib $RPM_BUILD_ROOT%{_javadir}/%{name}
 cp -a dist/properties $RPM_BUILD_ROOT%{_datadir}/%{name}/properties
 cp -a dist/skins $RPM_BUILD_ROOT%{_datadir}/%{name}/skins
-install %{name}.sh $RPM_BUILD_ROOT%{_bindir}/%{name}
+install -p %{name}.sh $RPM_BUILD_ROOT%{_bindir}/%{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -74,10 +67,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2009/12/07 10:51:40  glen
+- simplify shell wrapper, cosmetics
+
 Revision 1.2  2009/12/07 08:47:12  pawelz
 - do not copy config files into ~/.moviejukebox. Add /usr/share/moviejukebox to classpath istead.
-- added hints how to obtains sources
+- added hints how to obtain sources
 
 Revision 1.1  2009/12/06 12:58:10  pawelz
 - initial
-
================================================================

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



More information about the pld-cvs-commit mailing list