[javapackages/generate_javadoc: 4/7] Add docs
by Stanislav Ochotnicky
commit 1598e8bb4e8c6bf59089c874d539118e358a0412
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Wed Nov 2 18:24:42 2011 +0100
Add docs
macros.fjava | 54 ++++++++++++++++++++++++++++++++++--------------------
1 files changed, 34 insertions(+), 20 deletions(-)
---
diff --git a/macros.fjava b/macros.fjava
index 5577a93..482bbb3 100644
--- a/macros.fjava
+++ b/macros.fjava
@@ -61,6 +61,40 @@ python -m %{_datadir}/java-utils/maven_depmap %{-a} \\\
%{nil}
#==============================================================================
+
+# %generate_javadoc_subpackage can be used to completely create
+# javadoc subpackage for java projects. There are these variables that
+# change its behaviour:
+#
+# %__javadoc_license - set if the license is in non-standard place to
+# prevent Requires on main package
+# %__apidocs_dir - set custom path to directory with javadocs
+# (defaults to target/site/apidocs)
+# %__javadoc_skip_requires - if defined javadoc subpackage will not
+# require main package under any circumstances
+#
+
+
+%generate_javadoc_sub() %{expand:\
+%{!?__apidocs_dir: %global __apidocs_dir target/site/apidocs} \
+%{expand: %{__find_javadoc_license}} \
+%global __spec_check_pre %{expand:%{__java_check_pre}} \
+%package javadoc \
+Group: Documentation \
+Summary: Javadoc for %{name} \
+Requires: jpackage-utils \
+%if "%{__javadoc_license}" == "%{nil}" \
+%{?!__javadoc_skip_requires:Requires: %{?epoch:%{epoch}:}%{name}-%{version}} \
+%endif \
+%description javadoc \
+API documentation for %{name}. \
+%files javadoc \
+%{_javadocdir}/%{name} \
+%doc %{__javadoc_license} \
+# we needs this so that rpm runs __spec_check_pre \
+%check \
+}
+
%__java_check_pre %{expand: \
%{?__spec_check_pre} \
pushd %{buildsubdir} \
@@ -88,23 +122,3 @@ fi \
}
}
-%generate_javadoc_sub() %{expand:\
-%{expand: %{__find_javadoc_license}} \
-%global __javadoc_dir target/site/apidocs \
-%global __spec_check_pre %{expand:%{__java_check_pre}} \
-%package javadoc \
-Group: Documentation \
-Summary: Javadoc for %{name} \
-Requires: jpackage-utils \
-%if "%{__javadoc_license}" == "%{nil}" \
-%{?!__javadoc_skip_requires:Requires: %{?epoch:%{epoch}:}%{name}-%{version}} \
-%endif \
-%description javadoc \
-API documentation for %{name}. \
-%files javadoc \
-%{_javadocdir}/%{name} \
-%doc %{__javadoc_license} \
-# we needs this so that rpm runs __spec_check_pre \
-%check \
-}
-
12 years, 6 months
[javapackages/generate_javadoc: 3/7] Add support for multiple licenses
by Stanislav Ochotnicky
commit 782b7452acc6986fb370d321df6d030c4d7345f1
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Wed Nov 2 18:06:00 2011 +0100
Add support for multiple licenses
macros.fjava | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/macros.fjava b/macros.fjava
index bde7e58..5577a93 100644
--- a/macros.fjava
+++ b/macros.fjava
@@ -73,13 +73,17 @@ popd \
%{!?__javadoc_license: \
%global __javadoc_license %(\
cd %{buildsubdir} \
-for lic in LICENSE COPYING;do \
+licenses="" \
+for lic in LICENSE* COPYING* doc/LICENSE* doc/COPYING* license*;do \
if [ -f $lic ];then \
- echo $lic; \
- exit 0; \
+ licenses="$licenses $lic"; \
fi \
done \
-echo "%{nil}";
+if [ "$licenses" == "" ]; then \
+echo "%{nil}"; \
+else \
+echo $licenses; \
+fi \
)\
}
}
12 years, 6 months
[javapackages/generate_javadoc: 2/7] Make javadoc generator overridable
by Stanislav Ochotnicky
commit 7a69c702fd75fe4f9acab09287954a357858eaae
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Wed Nov 2 18:01:25 2011 +0100
Make javadoc generator overridable
macros.fjava | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/macros.fjava b/macros.fjava
index 836ed11..bde7e58 100644
--- a/macros.fjava
+++ b/macros.fjava
@@ -70,7 +70,7 @@ popd \
}
%__find_javadoc_license() %{expand: \
-%{!?__javadoc_license} \
+%{!?__javadoc_license: \
%global __javadoc_license %(\
cd %{buildsubdir} \
for lic in LICENSE COPYING;do \
@@ -82,6 +82,7 @@ done \
echo "%{nil}";
)\
}
+}
%generate_javadoc_sub() %{expand:\
%{expand: %{__find_javadoc_license}} \
12 years, 6 months
[javapackages/generate_javadoc: 1/7] Add javadoc subpackage generator
by Stanislav Ochotnicky
commit 26ebe8d701f53159f10194b43e51891fa1864eda
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Wed Nov 2 17:59:46 2011 +0100
Add javadoc subpackage generator
macros.fjava | 40 ++++++++++++++++++++++++++++++++++++++++
1 files changed, 40 insertions(+), 0 deletions(-)
---
diff --git a/macros.fjava b/macros.fjava
index 0c14779..836ed11 100644
--- a/macros.fjava
+++ b/macros.fjava
@@ -61,5 +61,45 @@ python -m %{_datadir}/java-utils/maven_depmap %{-a} \\\
%{nil}
#==============================================================================
+%__java_check_pre %{expand: \
+%{?__spec_check_pre} \
+pushd %{buildsubdir} \
+%{__mkdir_p} %{buildroot}/%{_javadocdir}/%{name} \
+cp -pr %{__javadoc_dir}/* %{buildroot}/%{_javadocdir}/%{name} \
+popd \
+}
+%__find_javadoc_license() %{expand: \
+%{!?__javadoc_license} \
+%global __javadoc_license %(\
+cd %{buildsubdir} \
+for lic in LICENSE COPYING;do \
+if [ -f $lic ];then \
+ echo $lic; \
+ exit 0; \
+fi \
+done \
+echo "%{nil}";
+)\
+}
+
+%generate_javadoc_sub() %{expand:\
+%{expand: %{__find_javadoc_license}} \
+%global __javadoc_dir target/site/apidocs \
+%global __spec_check_pre %{expand:%{__java_check_pre}} \
+%package javadoc \
+Group: Documentation \
+Summary: Javadoc for %{name} \
+Requires: jpackage-utils \
+%if "%{__javadoc_license}" == "%{nil}" \
+%{?!__javadoc_skip_requires:Requires: %{?epoch:%{epoch}:}%{name}-%{version}} \
+%endif \
+%description javadoc \
+API documentation for %{name}. \
+%files javadoc \
+%{_javadocdir}/%{name} \
+%doc %{__javadoc_license} \
+# we needs this so that rpm runs __spec_check_pre \
+%check \
+}
12 years, 6 months
[javapackages] (7 commits) Created branch generate_javadoc
by Stanislav Ochotnicky
The branch 'generate_javadoc' was created.
Summary of new commits:
26ebe8d... Add javadoc subpackage generator
7a69c70... Make javadoc generator overridable
782b745... Add support for multiple licenses
1598e8b... Add docs
69906ea... Change name to crete_javadoc_subpackage
27ccafa... Improve documentation a bit for create javadoc
c1dd8d9... Change javadoc hook to install_post
12 years, 6 months
[maven-checkstyle-plugin] Update to 2.8.
by Alexander Kurtakov
commit 82b74cbaaca86f91f1d3a25e709033d5d5bdb767
Author: Alexander Kurtakov < <akurtako(a)redhat.com>
Date: Wed Nov 2 15:19:29 2011 +0200
Update to 2.8.
.gitignore | 1 +
maven-checkstyle-plugin-maven-core-dep.patch | 30 ++++++++++++-------------
maven-checkstyle-plugin.spec | 7 ++++-
sources | 2 +-
4 files changed, 21 insertions(+), 19 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6272e08..62ca93a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ maven-checkstyle-plugin-2.7-source-release.zip
/maven-checkstyle-plugin-2.7
/maven-checkstyle-plugin-2.7-1.fc17.src.rpm
/maven-checkstyle-plugin-2_7-1_fc17
+maven-checkstyle-plugin-2.8-source-release.zip
diff --git a/maven-checkstyle-plugin-maven-core-dep.patch b/maven-checkstyle-plugin-maven-core-dep.patch
index a5a38c3..84007d5 100644
--- a/maven-checkstyle-plugin-maven-core-dep.patch
+++ b/maven-checkstyle-plugin-maven-core-dep.patch
@@ -1,16 +1,14 @@
-diff --git a/pom.xml b/pom.xml
-index 1064dfc..2f5be46 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -69,6 +69,11 @@ under the License.
- <!-- maven -->
- <dependency>
- <groupId>org.apache.maven</groupId>
-+ <artifactId>maven-core</artifactId>
-+ <version>${mavenVersion}</version>
-+ </dependency>
-+ <dependency>
-+ <groupId>org.apache.maven</groupId>
- <artifactId>maven-artifact</artifactId>
- <version>${mavenVersion}</version>
- </dependency>
+--- pom.xml.orig 2011-10-24 11:35:30.000000000 +0300
++++ pom.xml 2011-11-02 15:15:07.818007195 +0200
+@@ -69,6 +69,11 @@ under the License.
+ <!-- maven -->
+ <dependency>
+ <groupId>org.apache.maven</groupId>
++ <artifactId>maven-core</artifactId>
++ <version>${mavenVersion}</version>
++ </dependency>
++ <dependency>
++ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact</artifactId>
+ <version>${mavenVersion}</version>
+ </dependency>
diff --git a/maven-checkstyle-plugin.spec b/maven-checkstyle-plugin.spec
index 413a354..f2bdd69 100644
--- a/maven-checkstyle-plugin.spec
+++ b/maven-checkstyle-plugin.spec
@@ -1,5 +1,5 @@
Name: maven-checkstyle-plugin
-Version: 2.7
+Version: 2.8
Release: 1%{?dist}
Summary: Plugin that generates a report regarding the code style used by the developers
Group: Development/Libraries
@@ -65,7 +65,7 @@ This package contains the API documentation for %{name}.
%prep
%setup -q
-%patch0 -p1
+%patch0
#adapt to upstream checkstyle groupId
sed -i -e "s|<groupId>checkstyle|<groupId>com.puppycrawl.tools|g" pom.xml
@@ -99,6 +99,9 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
%{_javadocdir}/%{name}
%changelog
+* Wed Nov 2 2011 Alexander Kurtakov <akurtako(a)redhat.com> 2.8-1
+- Update to 2.8.
+
* Thu Sep 15 2011 Tomas Radej <tradej(a)redhat.com> - 2.7-1
- Updated to 2.7
- Guideline fixes
diff --git a/sources b/sources
index 84772d0..0622e12 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-56a4e7c1b5b68280bf9b8f02e11443b9 maven-checkstyle-plugin-2.7-source-release.zip
+e47e10974620490fb30223d68086fb26 maven-checkstyle-plugin-2.8-source-release.zip
12 years, 6 months
[jsch] Update to new upstream version.
by Alexander Kurtakov
commit 7a834a22b1e5aa0a309451109177f76cb41c73e5
Author: Alexander Kurtakov < <akurtako(a)redhat.com>
Date: Wed Nov 2 13:28:56 2011 +0200
Update to new upstream version.
.gitignore | 1 +
jsch.spec | 7 +++++--
sources | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d45f0a0..ec3718c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ jsch-0.1.39.zip
jsch-0.1.41.zip
jsch-0.1.43.zip
jsch-0.1.44.zip
+jsch-0.1.45.zip
diff --git a/jsch.spec b/jsch.spec
index 9624285..7303a70 100644
--- a/jsch.spec
+++ b/jsch.spec
@@ -29,8 +29,8 @@
#
Name: jsch
-Version: 0.1.44
-Release: 4%{?dist}
+Version: 0.1.45
+Release: 1%{?dist}
Epoch: 0
Summary: Pure Java implementation of SSH2
Group: Development/Libraries
@@ -120,6 +120,9 @@ ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_datadir}/%{name}
%changelog
+* Wed Nov 2 2011 Alexander Kurtakov <akurtako(a)redhat.com> 0:0.1.45-1
+- Update to new upstream version.
+
* Thu Sep 15 2011 Alexander Kurtakov <akurtako(a)redhat.com> 0:0.1.44-4
- Guidelines fixes.
diff --git a/sources b/sources
index 067c1b9..016c9cf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9954d151f16629ed5cf02e56c031954e jsch-0.1.44.zip
+dbd51c158bc1218dd08b8c87dfc4c09b jsch-0.1.45.zip
12 years, 6 months