rpms/checkstyle/devel checkstyle-build.patch, NONE, 1.1 checkstyle-script, NONE, 1.1 checkstyle.catalog, NONE, 1.1 checkstyle.spec, 1.6, 1.7 checkstyle-4.1-checks-modifier-AllTests.patch, 1.1, NONE checkstyle-4.1-checks-naming-AllTests.patch, 1.1, NONE checkstyle-4.1-checks-sizes-AllTests.patch, 1.1, NONE checkstyle-4.1-checks-whitespace-AllTests.patch, 1.1, NONE checkstyle-4.1-grammars-AllTests.patch, 1.1, NONE checkstyle-4.1-script, 1.1, NONE checkstyle-4.1.catalog, 1.1, NONE
Stanislav Ochotnicky
sochotni at fedoraproject.org
Thu Jun 24 14:08:34 UTC 2010
Author: sochotni
Update of /cvs/pkgs/rpms/checkstyle/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv7957
Modified Files:
checkstyle.spec
Added Files:
checkstyle-build.patch checkstyle-script checkstyle.catalog
Removed Files:
checkstyle-4.1-checks-modifier-AllTests.patch
checkstyle-4.1-checks-naming-AllTests.patch
checkstyle-4.1-checks-sizes-AllTests.patch
checkstyle-4.1-checks-whitespace-AllTests.patch
checkstyle-4.1-grammars-AllTests.patch checkstyle-4.1-script
checkstyle-4.1.catalog
Log Message:
Rebase to new version, cleanup, test are being run now
checkstyle-build.patch:
build.xml | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
--- NEW FILE checkstyle-build.patch ---
diff --git a/build.xml b/build.xml
index b06580a..8e53668 100644
--- a/build.xml
+++ b/build.xml
@@ -12,10 +12,10 @@
<property name="antlr.jar" value="lib/antlr.jar" />
<property name="velocity.jar" value="lib/velocity-dep-1.4.jar" />
<property name="jdom.jar" value="lib/jdom-b9.jar" />
- <property name="junit.jar" value="lib/junit-4.4.jar" />
+ <property name="junit.jar" value="lib/junit4.jar" />
<property name="beanutils.jar" value="lib/commons-beanutils-core.jar" />
- <property name="collections.jar" value="lib/google-collect-1.0.jar" />
- <property name="cli.jar" value="lib/commons-cli-1.1.jar" />
+ <property name="collections.jar" value="lib/guava.jar" />
+ <property name="cli.jar" value="lib/commons-cli.jar" />
<property name="logging.jar" value="lib/commons-logging.jar" />
<property name="tools.jar" value="${java.home}/../lib/tools.jar" />
<property name="emma.enabled" value="true" />
@@ -299,7 +299,7 @@
excludes="**/Generated*.java,**/gui/*"/>
<formatter type="plain"/>
<formatter type="xml" toFile="${target.dir}/cs_errors.xml"/>
- <classpath refid="run.classpath"/>
+<!-- <classpath refid="run.classpath"/> -->
<property key="checkstyle.cache.file" file="${target.dir}/cachefile"/>
<property key="checkstyle.header.file" file="java.header"/>
<property key="checkstyle.importcontrol.file" file="import-control.xml"/>
@@ -508,8 +508,8 @@ For users of JDK 1.5 at least version 1.6.2 of Ant is required.
filesetmanifest="skip">
<zipfileset src="${dist.dir}/checkstyle-${version}/antlr.jar" excludes="META-INF/*"/>
<zipfileset src="${dist.dir}/checkstyle-${version}/commons-beanutils-core.jar" excludes="META-INF/*,**/*.html"/>
- <zipfileset src="${dist.dir}/checkstyle-${version}/google-collect-1.0.jar" excludes="META-INF/*"/>
- <zipfileset src="${dist.dir}/checkstyle-${version}/commons-cli-1.1.jar" excludes="META-INF/*"/>
+ <zipfileset src="${dist.dir}/checkstyle-${version}/guava.jar" excludes="META-INF/*"/>
+ <zipfileset src="${dist.dir}/checkstyle-${version}/commons-cli.jar" excludes="META-INF/*"/>
<zipfileset src="${dist.dir}/checkstyle-${version}/commons-logging.jar" excludes="META-INF/*,**/package.html"/>
<zipfileset src="${dist.dir}/checkstyle-${version}/checkstyle-${version}.jar" excludes="META-INF/*"/>
</jar>
@@ -589,7 +589,7 @@ For users of JDK 1.5 at least version 1.6.2 of Ant is required.
Windowtitle="Checkstyle API"
classpathref="javadoc.classpath"
Use="true"
- Footer="<a target="_top" href="./{@docRoot}/../index.html">Back to the Checkstyle Home Page</a>"
+ Footer="<a target="_top" href="/usr/share/doc/checkstyle-manual-5.1/index.html">Back to the Checkstyle Home Page</a>"
useExternalFile="yes"
encoding="iso-8859-1"
source="${checkstyle.minimum.javaversion}"
@@ -636,10 +636,11 @@ For users of JDK 1.5 at least version 1.6.2 of Ant is required.
path="${checkstyle.dest}">
</doclet>
</javadoc>
-
+<!--
<taskdef name="anakia" classname="org.apache.velocity.anakia.AnakiaTask">
<classpath refid="velocity.classpath"/>
</taskdef>
+-->
<copy todir="${xdocs.dest}">
<fileset dir="${xdocs.src}">
@@ -648,7 +649,7 @@ For users of JDK 1.5 at least version 1.6.2 of Ant is required.
<include name="**/*.png"/>
</fileset>
</copy>
-
+<!--
<anakia basedir="${target.dir}/xdocs"
destdir="${xdocs.dest}/"
extension=".html"
@@ -659,7 +660,7 @@ For users of JDK 1.5 at least version 1.6.2 of Ant is required.
lastModifiedCheck="true"
templatePath="${xdocs.src}/stylesheets">
</anakia>
-
+-->
</target>
<target name="report.translation"
***** Error reading new file: [Errno 2] No such file or directory: 'checkstyle-script'
--- NEW FILE checkstyle.catalog ---
-- Checkstyle DTD catalog --
-- JPackage Project <http://www.jpackage.org/> --
PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
configuration_1_2.dtd
PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.1//EN"
configuration_1_1.dtd
PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.0//EN
configuration_1_0.dtd
PUBLIC "-//Puppy Crawl//DTD Package Names 1.0//EN"
packages_1_0.dtd
PUBLIC "-//Puppy Crawl//DTD Suppressions 1.0//EN"
suppressions_1_0.dtd
Index: checkstyle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/checkstyle/devel/checkstyle.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- checkstyle.spec 24 Jul 2009 18:52:34 -0000 1.6
+++ checkstyle.spec 24 Jun 2010 14:08:34 -0000 1.7
@@ -29,44 +29,24 @@
#
Name: checkstyle
-Version: 4.1
-Release: 7%{?dist}
-Epoch: 0
+Version: 5.1
+Release: 1%{?dist}
Summary: Java source code checker
# src/checkstyle/com/puppycrawl/tools/checkstyle/grammars/java.g is GPLv2+
# Most of the files in contrib/usage/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/usage/transmogrify/ are BSD
License: LGPLv2+ and GPLv2+ and BSD
Group: Development/Tools
-Source0: http://download.sf.net/checkstyle/checkstyle-src-4.1.tar.gz
-Source1: %{name}-%{version}-script
-Source2: %{name}-%{version}.catalog
-
-Patch0: %{name}-%{version}-build.patch
-#Patch1: %{name}-%{version}-javadoc-crosslink.patch
-
-Patch2: %{name}-%{version}-checks-AllTests.patch
-Patch3: %{name}-%{version}-checks-blocks-AllTests.patch
-Patch4: %{name}-%{version}-checks-coding-AllTests.patch
-Patch5: %{name}-%{version}-checks-design-AllTests.patch
-Patch6: %{name}-%{version}-checks-imports-AllTests.patch
-Patch7: %{name}-%{version}-checks-indentation-AllTests.patch
-Patch8: %{name}-%{version}-checks-javadoc-AllTests.patch
-Patch9: %{name}-%{version}-checks-metrics-AllTests.patch
-Patch10: %{name}-%{version}-checks-modifier-AllTests.patch
-Patch11: %{name}-%{version}-checks-naming-AllTests.patch
-Patch12: %{name}-%{version}-checks-sizes-AllTests.patch
-Patch13: %{name}-%{version}-checks-whitespace-AllTests.patch
-Patch14: %{name}-%{version}-grammars-AllTests.patch
+Source0: http://download.sf.net/checkstyle/checkstyle-src-%{version}.tar.gz
+Source1: %{name}-script
+Source2: %{name}.catalog
+
+Patch0: %{name}-build.patch
URL: http://checkstyle.sourceforge.net/
-Requires: ant >= 0:1.6
-Requires: antlr >= 0:2.7.1, regexp >= 0:1.2, jakarta-commons-logging
-Requires: jakarta-commons-cli, jakarta-commons-beanutils
-Requires: jakarta-commons-collections, jpackage-utils >= 0:1.5
-Requires: jaxp_parser_impl
BuildRequires: ant >= 0:1.6, ant-nodeps >= 0:1.6
BuildRequires: ant-junit >= 0:1.6, junit, antlr >= 0:2.7.1
-BuildRequires: java-devel >= 1.6.0
+BuildRequires: ant-trax
+BuildRequires: java-devel >= 1:1.6.0
BuildRequires: jakarta-commons-beanutils
BuildRequires: jakarta-commons-cli, xalan-j2, jpackage-utils >= 0:1.5
BuildRequires: jakarta-commons-logging, jakarta-commons-collections, xerces-j2
@@ -74,6 +54,14 @@ BuildRequires: antlr-javadoc, xml-commo
BuildRequires: jakarta-commons-beanutils-javadoc, ant-javadoc, /usr/bin/perl
BuildRequires: jdom
BuildRequires: velocity
+BuildRequires: emma
+BuildRequires: junit4
+BuildRequires: guava
+Requires: ant >= 0:1.6
+Requires: antlr >= 0:2.7.1, regexp >= 0:1.2, jakarta-commons-logging
+Requires: jakarta-commons-cli, jakarta-commons-beanutils
+Requires: jakarta-commons-collections, jpackage-utils >= 0:1.5
+Requires: jaxp_parser_impl
Requires: antlr >= 0:2.7.1
Requires: java
Requires: jpackage-utils
@@ -87,6 +75,8 @@ Requires: velocity
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Obsoletes: %{name}-optional < %{version}-%{release}
+
%description
A tool for checking Java source code for adherence to a set of rules.
@@ -112,39 +102,20 @@ Summary: Manual for %{name}
%description manual
Manual for %{name}.
-%package optional
-Group: Development/Tools
-Summary: Optional functionality for %{name}
-Requires: %{name} = %{epoch}:%{version}
-Requires(post): sed
-Requires(postun): sed
-
-%description optional
-Optional functionality for %{name}.
-
%prep
%setup -q -n %{name}-src-%{version}
-%patch0 -b .sav
-#%patch1 -p0
-%patch2 -b .sav
-%patch3 -b .sav
-%patch4 -b .sav
-%patch5 -b .sav
-%patch6 -b .sav
-%patch7 -b .sav
-%patch8 -b .sav
-%patch9 -b .sav
-%patch10 -b .sav
-%patch11 -b .sav
-%patch12 -b .sav
-%patch13 -b .sav
-%patch14 -b .sav
+%patch0 -p1 -b .sav
%__perl -p -i -e 's|\./{\@docRoot}/\.\./index\.html|%{_docdir}/%{name}-manual-%{version}/index.html|' build.xml
# remove all binary libs
find . -name "*.jar" -exec %__rm -f {} \;
+# fix encoding issues in docs
+sed -i 's/\r//' LICENSE LICENSE.apache20 README RIGHTS.antlr \
+ build.xml checkstyle_checks.xml sun_checks.xml suppressions.xml \
+ src/xdocs/css/*.css contrib/hooks/*.pl
+
%build
-export OPT_JAR_LIST="ant/ant-junit junit ant/ant-nodeps jdom velocity"
+export OPT_JAR_LIST="ant/ant-junit ant/ant-trax junit ant/ant-nodeps jdom velocity"
export CLASSPATH=$(build-classpath commons-collections)
pushd lib
@@ -153,22 +124,20 @@ ln -sf $(build-classpath commons-beanuti
ln -sf $(build-classpath commons-collections) .
ln -sf $(build-classpath commons-cli) .
ln -sf $(build-classpath commons-logging) .
+ln -sf $(build-classpath emma) .
+ln -sf $(build-classpath emma_ant) .
+ln -sf $(build-classpath junit4 ) .
+ln -sf $(build-classpath guava ) .
-# FIXME: re-enable when Fedora has emma
-#ln -sf $(build-classpath emma) .
-#ln -sf $(build-classpath emma_ant) .
popd
-# FIXME: target run.tests disabled because it will need emma which Fedora does
-# not have yet
-
%ant \
-Dbuild.sysclasspath=first \
-Dant.javadoc=%{_javadocdir}/ant \
-Dantlr.javadoc=%{_javadocdir}/antlr \
-Djaxp.javadoc=%{_javadocdir}/xml-commons-apis \
-Dbeanutils.javadoc=%{_javadocdir}/jakarta-commons-beanutils \
- build.bindist
+ build.bindist run.tests
%install
%__rm -rf %{buildroot}
@@ -177,8 +146,6 @@ popd
%__mkdir_p %{buildroot}%{_javadir}
%__cp -pa target/dist/%{name}-%{version}/%{name}-%{version}.jar \
%{buildroot}%{_javadir}
-%__cp -pa target/dist/%{name}-%{version}/%{name}-optional-%{version}.jar \
- %{buildroot}%{_javadir}
(cd %{buildroot}%{_javadir} &&
for jar in *-%{version}.jar;
do %__ln_s ${jar} `echo $jar| %__sed "s|-%{version}||g"`;
@@ -186,12 +153,10 @@ popd
)
# script
-%__mkdir_p %{buildroot}%{_bindir}
-%__cp -pa %{SOURCE1} %{buildroot}%{_bindir}/%{name}
+install -Dpm 755 %{SOURCE1} %{buildroot}%{_bindir}/%{name}
# dtds
-%__mkdir_p %{buildroot}%{_datadir}/xml/%{name}
-%__cp -pa %{SOURCE2} %{buildroot}%{_datadir}/xml/%{name}/catalog
+install -Dpm 644 %{SOURCE2} %{buildroot}%{_datadir}/xml/%{name}/catalog
%__cp -pa src/checkstyle/com/puppycrawl/tools/checkstyle/*.dtd \
%{buildroot}%{_datadir}/xml/%{name}
@@ -212,13 +177,6 @@ popd
checkstyle antlr regexp jakarta-commons-beanutils jakarta-commons-cli jakarta-commons-logging jakarta-commons-collections jaxp_parser_impl
EOF
-# fix encoding issues in docs
-for i in LICENSE LICENSE.apache README RIGHTS.antlr \
- build.xml checkstyle_checks.xml java.header sun_checks.xml suppressions.xml \
- target/dist/%{name}-%{version}/docs/css/*; do
- tr -d \\r < $i > temp_file; mv temp_file $i
-done
-
%clean
%__rm -rf %{buildroot}
@@ -238,43 +196,36 @@ if [ -x %{_bindir}/install-catalog -a -d
%{_datadir}/xml/%{name}/catalog > /dev/null || :
fi
-%post optional
-%__grep -q checkstyle-optional %{_sysconfdir}/ant.d/%{name} || \
-%__sed -i -e 's|checkstyle|checkstyle checkstyle-optional|' %{_sysconfdir}/ant.d/%{name} || :
-
-%postun optional
-%__grep -q checkstyle-optional %{_sysconfdir}/ant.d/%{name} && \
-%__sed -i -e 's|checkstyle-optional ||' %{_sysconfdir}/ant.d/%{name} || :
-
%files
-%defattr(0644,root,root,0755)
-%doc LICENSE LICENSE.apache README RIGHTS.antlr
+%defattr(-,root,root,-)
+%doc LICENSE LICENSE.apache20 README RIGHTS.antlr
%doc build.xml checkstyle_checks.xml java.header sun_checks.xml suppressions.xml
%{_javadir}/%{name}.jar
%{_javadir}/%{name}-%{version}.jar
%{_datadir}/xml/%{name}
-%attr(0755,root,root) %{_bindir}/*
+%{_bindir}/*
%config(noreplace) %{_sysconfdir}/ant.d/%{name}
%files demo
-%defattr(0644,root,root,0755)
+%defattr(-,root,root,-)
%{_datadir}/%{name}
%files javadoc
-%defattr(0644,root,root,0755)
+%defattr(-,root,root,-)
%doc %{_javadocdir}/*
%files manual
-%defattr(0644,root,root,0755)
+%defattr(-,root,root,-)
%doc target/dist/%{name}-%{version}/docs/*
-%files optional
-%defattr(0644,root,root,0755)
-%{_javadir}/%{name}-optional.jar
-%{_javadir}/%{name}-optional-%{version}.jar
-
%changelog
+* Wed Jun 9 2010 Stanislav Ochotnicky <sochotnicky at redhat.com> - 5.1-1
+- Rebase to new version
+- Cleanup of whole spec file
+- Enable emma (present in Fedora now)
+- Drop epoch
+
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:4.1-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
--- checkstyle-4.1-checks-modifier-AllTests.patch DELETED ---
--- checkstyle-4.1-checks-naming-AllTests.patch DELETED ---
--- checkstyle-4.1-checks-sizes-AllTests.patch DELETED ---
--- checkstyle-4.1-checks-whitespace-AllTests.patch DELETED ---
--- checkstyle-4.1-grammars-AllTests.patch DELETED ---
--- checkstyle-4.1-script DELETED ---
--- checkstyle-4.1.catalog DELETED ---
More information about the scm-commits
mailing list