OpenPKG CVS Repository http://cvs.openpkg.org/ ____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [email protected] Module: openpkg-src Date: 26-Jul-2009 23:07:09 Branch: HEAD Handle: 2009072622070900 Modified files: openpkg-src/ant ant.spec Log: simplify packaging Summary: Revision Changes Path 1.69 +13 -13 openpkg-src/ant/ant.spec ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-src/ant/ant.spec ============================================================================ $ cvs diff -u -r1.68 -r1.69 ant.spec --- openpkg-src/ant/ant.spec 15 Jul 2009 18:31:06 -0000 1.68 +++ openpkg-src/ant/ant.spec 26 Jul 2009 21:07:09 -0000 1.69 @@ -38,7 +38,7 @@ Group: Building License: Apache Software License Version: %{V_ant} -Release: 20090715 +Release: 20090726 # package options %option with_docs no @@ -109,28 +109,28 @@ $RPM_BUILD_ROOT%{l_prefix}/bin \ $RPM_BUILD_ROOT%{l_prefix}/etc/ant \ $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d \ - $RPM_BUILD_ROOT%{l_prefix}/libexec/ant/lib \ + $RPM_BUILD_ROOT%{l_prefix}/libexec/ant \ $RPM_BUILD_ROOT%{l_prefix}/man/man1 \ $RPM_BUILD_ROOT%{l_prefix}/man/man5 %{l_shtool} install -c -m 755 \ -e 's;/etc/ant.conf;%{l_prefix}/etc/ant/ant.conf;' \ - -e 's;^\(ANT_LIB="\)[^"]*\("\);\1%{l_prefix}/libexec/ant/lib\2;' \ + -e 's;^\(ANT_LIB="\)[^"]*\("\);\1%{l_prefix}/libexec/ant\2;' \ bin/ant $RPM_BUILD_ROOT%{l_prefix}/bin/ %{l_shtool} install -c -m 644 \ - lib/*.jar etc/*.jar $RPM_BUILD_ROOT%{l_prefix}/libexec/ant/lib/ + lib/*.jar etc/*.jar $RPM_BUILD_ROOT%{l_prefix}/libexec/ant/ %{l_shtool} install -c -m 644 \ - apache-ivy-*/ivy-%{V_ivy}.jar $RPM_BUILD_ROOT%{l_prefix}/libexec/ant/lib/ivy.jar + apache-ivy-*/ivy-%{V_ivy}.jar $RPM_BUILD_ROOT%{l_prefix}/libexec/ant/ivy.jar ( cd apache-ivy-*/lib for jar in commons-codec-*.jar commons-httpclient-*.jar \ commons-logging-*.jar commons-vfs-*.jar jsch-*.jar oro-*.jar; do newjar="ivy-`echo $jar | sed -e 's;-[0-9].*$;;'`.jar" %{l_shtool} install -c -m 644 \ - $jar $RPM_BUILD_ROOT%{l_prefix}/libexec/ant/lib/$newjar + $jar $RPM_BUILD_ROOT%{l_prefix}/libexec/ant/$newjar done ) || exit $? ( echo "#!/bin/sh" - echo "CP=\"%{l_prefix}/libexec/ant/lib/ivy.jar\"" - echo "for jar in %{l_prefix}/libexec/ant/lib/ivy-*.jar; do" + echo "CP=\"%{l_prefix}/libexec/ant/ivy.jar\"" + echo "for jar in %{l_prefix}/libexec/ant/ivy-*.jar; do" echo " CP=\"\${CP}:\${jar}\"" echo "done" echo "%{l_prefix}/bin/java -Djava.awt.headless=true -cp \$CP org.apache.ivy.Main \${1+\"\...@\"}" @@ -138,12 +138,12 @@ %{l_shtool} install -c -m 755 \ ivy.sh $RPM_BUILD_ROOT%{l_prefix}/bin/ivy %{l_shtool} install -c -m 644 \ - junit*/junit-%{V_junit}.jar $RPM_BUILD_ROOT%{l_prefix}/libexec/ant/lib/junit.jar + junit*/junit-%{V_junit}.jar $RPM_BUILD_ROOT%{l_prefix}/libexec/ant/junit.jar %{l_shtool} install -c -m 644 \ etc/*.xsl etc/checkstyle/*.xsl $RPM_BUILD_ROOT%{l_prefix}/etc/ant/ %{l_shtool} install -c -m 644 \ %{SOURCE maven-ant-tasks-%{V_maven}.jar} \ - $RPM_BUILD_ROOT%{l_prefix}/libexec/ant/lib/maven-ant-task.jar + $RPM_BUILD_ROOT%{l_prefix}/libexec/ant/maven-ant-task.jar %{l_shtool} install -c -m 644 \ %{SOURCE ant.1} \ $RPM_BUILD_ROOT%{l_prefix}/man/man1/ @@ -151,10 +151,10 @@ %{SOURCE build.xml.5} \ $RPM_BUILD_ROOT%{l_prefix}/man/man5/ %if "%{with_docs}" == "yes" + %{l_shtool} mkdir -f -p -m 755 \ + $RPM_BUILD_ROOT%{l_prefix}/share/ant rm docs/LICENSE* - mv docs $RPM_BUILD_ROOT%{l_prefix}/libexec/ant/ - %{l_shtool} install -c -m 644 \ - welcome.html $RPM_BUILD_ROOT%{l_prefix}/libexec/ant/docs/ + cp -rp docs/* $RPM_BUILD_ROOT%{l_prefix}/share/ant/ %endif %{l_shtool} install -c -m 644 %{l_value -s -a} \ %{SOURCE ant.conf} $RPM_BUILD_ROOT%{l_prefix}/etc/ant/ @@ . ______________________________________________________________________ OpenPKG http://openpkg.org CVS Repository Commit List [email protected]
