[jsch] Update to latest upstream release - 0.1.46.
by Alexander Kurtakov
commit 760d4f5f69f5ce804a1b0eb473cd70d5c77b3cc7
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Wed Feb 15 18:42:20 2012 +0200
Update to latest upstream release - 0.1.46.
.gitignore | 1 +
jsch.spec | 7 +++++--
sources | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ec3718c..165723d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ jsch-0.1.41.zip
jsch-0.1.43.zip
jsch-0.1.44.zip
jsch-0.1.45.zip
+jsch-0.1.46.zip
diff --git a/jsch.spec b/jsch.spec
index 37d4952..51046bc 100644
--- a/jsch.spec
+++ b/jsch.spec
@@ -29,8 +29,8 @@
#
Name: jsch
-Version: 0.1.45
-Release: 2%{?dist}
+Version: 0.1.46
+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 Feb 15 2012 Alexander Kurtakov <akurtako(a)redhat.com> 0:0.1.46-1
+- Update to latest upstream version 0.1.46.
+
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0:0.1.45-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
diff --git a/sources b/sources
index 016c9cf..2e6eb38 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-dbd51c158bc1218dd08b8c87dfc4c09b jsch-0.1.45.zip
+9e8a88a7ed26d2f1feb2edf2382585f6 jsch-0.1.46.zip
12 years, 3 months
[maven-jar-plugin] Update to 2.4.0.
by Alexander Kurtakov
commit d0b17f6b5e293698ff68bd5a96d90c1806fa24ab
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Wed Feb 15 16:30:47 2012 +0200
Update to 2.4.0.
.gitignore | 1 +
maven-jar-plugin.spec | 9 ++++++---
sources | 2 +-
3 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f167b6b..06568f4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
maven-jar-plugin-2.3.tar.xz
maven-jar-plugin-2.3.1-source-release.zip
/maven-jar-plugin-2.3.2-source-release.zip
+maven-jar-plugin-2.4-source-release.zip
diff --git a/maven-jar-plugin.spec b/maven-jar-plugin.spec
index 6be630c..3f78a80 100644
--- a/maven-jar-plugin.spec
+++ b/maven-jar-plugin.spec
@@ -1,6 +1,6 @@
Name: maven-jar-plugin
-Version: 2.3.2
-Release: 2%{?dist}
+Version: 2.4
+Release: 1%{?dist}
Summary: Maven JAR Plugin
Group: Development/Libraries
@@ -65,7 +65,7 @@ sed -i -e "s|plexus-container-default|plexus-container|g" pom.xml
%build
# Test class MockArtifact doesn't override method getMetadata
-mvn-rpmbuild install javadoc:aggregate -Dmaven.test.skip -X
+mvn-rpmbuild install javadoc:aggregate -Dmaven.test.skip
%install
# jars
@@ -91,6 +91,9 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
%{_javadocdir}/%{name}
%changelog
+* Wed Feb 15 2012 Alexander Kurtakov <akurtako(a)redhat.com> 2.4-1
+- Update to 2.4.0.
+
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.3.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
diff --git a/sources b/sources
index 4ba0c20..8cb4056 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-64f5367c10a477b9cdfa9f730abc5e88 maven-jar-plugin-2.3.2-source-release.zip
+fcda43ca83e23e4e569465cc58c8d7ce maven-jar-plugin-2.4-source-release.zip
12 years, 3 months
[javapackages: 20/20] Merge branch 'generate_javadoc'
by Stanislav Ochotnicky
commit 93a2f5fa7347a329df9a608521baa2a0306ab28d
Merge: 1f0a927 bfcbb12
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Wed Feb 15 15:26:26 2012 +0100
Merge branch 'generate_javadoc'
macros.fjava | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 58 insertions(+), 0 deletions(-)
---
diff --cc macros.fjava
index 9d52d92,d4b07e9..a658871
--- a/macros.fjava
+++ b/macros.fjava
@@@ -73,5 -62,62 +73,63 @@@ python -m %{_datadir}/java-utils/maven_
#==============================================================================
+ # %create_javadoc_subpackage can be used to completely create
+ # javadoc subpackage for java projects.
+ # !!! Needs to be used at the end of %install section
+ # There are these variables that change its behaviour:
+ #
+ # %__javadoc_license - set if the license is in non-standard place
+ # %__apidocs_dir - set custom path to directory with javadocs
+ # (defaults to target/site/apidocs)
+ # %__javadoc_no_license - if defined javadoc subpackage will not have
+ # licensing information. Use only if if upstream
+ # doesn't provide separate license file.
+ #
+
+
+ %create_javadoc_subpackage() %{expand:\
+ %{!?__apidocs_dir: %global __apidocs_dir target/site/apidocs} \
+ %{expand: %{__find_javadoc_license}} \
+ %global __spec_install_post %{expand:%{__java_install_post}} \
+ %if "%{__javadoc_license}" == "%{nil}" \
+ %{?!__javadoc_no_license:echo License not found. Either set __javadoc_license to point to license file or set __javadoc_no_license if sources do not contain license file;exit 1;} \
+ %endif \
+ %package javadoc \
+ Group: Documentation \
+ Summary: Javadoc for %{name} \
+ Requires: jpackage-utils \
+ %description javadoc \
+ API documentation for %{name}. \
+ %files javadoc \
+ %{_javadocdir}/%{name} \
+ %doc %{__javadoc_license} \
+ }
+
+ %__java_install_post %{expand: \
+ %{?__spec_check_pre} \
+ pushd %{buildsubdir} \
+ %{__mkdir_p} %{buildroot}/%{_javadocdir}/%{name} \
+ cp -pr %{__apidocs_dir}/* %{buildroot}/%{_javadocdir}/%{name} \
+ popd \
+ }
+
+ %__find_javadoc_license() %{expand: \
+ %{!?__javadoc_license: \
+ %global __javadoc_license %(\
+ cd %{buildsubdir} \
+ licenses="" \
+ for lic in LICENSE* COPYING* doc/LICENSE* doc/COPYING* license*;do \
+ if [ -f $lic ];then \
+ licenses="$licenses $lic"; \
+ fi \
+ done \
+ if [ "$licenses" == "" ]; then \
+ echo "%{nil}"; \
+ else \
+ echo $licenses; \
+ fi \
+ )\
+ }
+ }
+
12 years, 3 months
[javapackages] (20 commits) ...Merge branch 'generate_javadoc'
by Stanislav Ochotnicky
Summary of changes:
d39bae4... Fix endline slashes with optional arguments (*)
4bd4aff... Fix rpm macro expansion problem when not on separate line (*)
3a4c926... Bail if maven_depmap is improperly called on pom without ja (*)
538db5c... Add exploded OSGi bundles provides generation. (*)
b3fec49... Fix pom directory path (*)
cb0a504... Check existence of jar file (*)
135e91f... Add support for additional jar directories (*)
8150fb0... Fix OSGi provides and requires generators to not fail(i.e. (*)
23080d6... Strip gid,aid and version to prevent problems (*)
8dd79b0... Normalize manifest lines. (*)
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 (*)
6c9dba2... Fix forgotten old macro in javadoc generation (*)
bfcbb12... If licensing is not overriden bail instead of adding requir (*)
93a2f5f... Merge branch 'generate_javadoc'
(*) This commit already existed in another branch; no separate mail sent
12 years, 3 months