[plexus-cli] Fix license tag to be ASL 2.0 (no plexus licensing anywhere)
by Stanislav Ochotnicky
commit 7a7f2f5072c82f8a09256d96b11deb3dc7ea1686
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Fri Nov 16 15:09:54 2012 +0100
Fix license tag to be ASL 2.0 (no plexus licensing anywhere)
- Update to new guidelines
plexus-cli.spec | 28 ++++++++++------------------
1 files changed, 10 insertions(+), 18 deletions(-)
---
diff --git a/plexus-cli.spec b/plexus-cli.spec
index 991418e..bed5bd5 100644
--- a/plexus-cli.spec
+++ b/plexus-cli.spec
@@ -33,10 +33,10 @@
Name: %{parent}-%{subname}
Version: 1.2
-Release: 12%{?dist}
+Release: 13%{?dist}
Epoch: 0
Summary: Command Line Interface facilitator for Plexus
-License: ASL 2.0 and Plexus
+License: ASL 2.0
Group: Development/Libraries
URL: http://plexus.codehaus.org/
# svn export http://svn.codehaus.org/plexus/archive/plexus-tools/tags/plexus-cli-1.2
@@ -51,7 +51,6 @@ Patch0: plexus-cli-licenseheaders.patch
BuildArch: noarch
BuildRequires: jpackage-utils >= 0:1.7.3
-BuildRequires: ant >= 0:1.6.5
BuildRequires: junit
BuildRequires: maven
BuildRequires: maven-compiler-plugin
@@ -72,8 +71,6 @@ BuildRequires: apache-commons-cli
Requires: plexus-classworlds
Requires: plexus-containers-container-default
Requires: plexus-utils
-Requires(post): jpackage-utils >= 0:1.7.3
-Requires(postun): jpackage-utils >= 0:1.7.3
%description
The Plexus project seeks to create end-to-end developer tools for
@@ -98,40 +95,35 @@ find . -name "*.jar" -exec rm -f {} \;
%patch0 -p3
%build
-mvn-rpmbuild \
- install javadoc:javadoc
+mvn-rpmbuild install javadoc:javadoc
%install
# jars
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/plexus
install -pm 644 target/%{name}-%{version}.jar \
$RPM_BUILD_ROOT%{_javadir}/plexus/%{subname}.jar
-%add_to_maven_depmap org.codehaus.plexus %{name} %{namedversion} JPP/%{parent} %{subname}
# pom
install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{parent}-%{subname}.pom
+%add_maven_depmap JPP.%{parent}-%{subname}.pom plexus/%{subname}.jar
+
# javadoc
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
-%files
-%{_javadir}/%{parent}/*
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
+%files -f .mfiles
%files javadoc
%doc %{_javadocdir}/*
%changelog
+* Fri Nov 16 2012 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0:1.2-13
+- Fix license tag to be ASL 2.0 (no plexus licensing anywhere)
+- Update to new guidelines
+
* Sat Jul 21 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0:1.2-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
11 years, 7 months
[scirenderer/f18] Use tee instead of cat to print out the jar path
by Clément David
commit 7590e5c7eaa1b94600234d78bc33145d73dacbcb
Author: Clément DAVID <clement.david(a)scilab-enterprises.com>
Date: Fri Nov 16 14:30:42 2012 +0100
Use tee instead of cat to print out the jar path
- remove noarch to pass the build (f18 only)
- rebuilt
scirenderer.spec | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
---
diff --git a/scirenderer.spec b/scirenderer.spec
index ae1732a..14ced0e 100644
--- a/scirenderer.spec
+++ b/scirenderer.spec
@@ -1,6 +1,6 @@
Name: scirenderer
Version: 1.0.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A Java rendering library based on JoGL
License: CeCILL
@@ -19,7 +19,8 @@ Requires: jpackage-utils
Requires: jogl2
Requires: jlatexmath
-BuildArch: noarch
+# koji build issue on f18 only
+#BuildArch: noarch
%description
This Java API allows 2-D or 3-D plotting from simple 2-D graph to complex
@@ -39,7 +40,7 @@ This package contains the API documentation for %{name}.
%setup -q
# Update path according to the Fedora Guidelines
-cat >scirenderer-libs.properties << EOF
+tee >scirenderer-libs.properties << EOF
jogl2.jar = %{_libdir}/jogl2/jogl2.jar
gluegen2-rt.jar = %{_libdir}/gluegen2/gluegen2-rt.jar
jlatexmath.jar = %{_javadir}/jlatexmath.jar
@@ -76,6 +77,11 @@ cp -pr docs/* %{buildroot}%{_javadocdir}/%{name}
%doc CHANGES
%changelog
+* Fri Nov 16 2012 Clément David <c.david86(a)gmail.com> - 1.0.2-2
+- Use tee instead of cat to print out the jar path
+- remove noarch to pass the build (f18 only)
+- rebuilt
+
* Tue Oct 02 2012 Clément David <c.david86(a)gmail.com> - 1.0.2-1
- Update version
11 years, 7 months
[jcifs/f18] (4 commits) ...rebuilt
by gil
Summary of changes:
cf88f84... fixed rhbz#875685 (Incorrect license tag). (*)
8dd83c2... fixed rhbz#875685 (Incorrect license tag). (*)
6a51426... fixed rhbz#875685 (Incorrect license tag). (*)
9af9ed3... rebuilt (*)
(*) This commit already existed in another branch; no separate mail sent
11 years, 7 months
[jcifs] rebuilt
by gil
commit 9af9ed34bb47d0e3a2ca490eb64d1c933de61344
Author: gil <puntogil(a)libero.it>
Date: Fri Nov 16 11:59:00 2012 +0100
rebuilt
jcifs.spec | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/jcifs.spec b/jcifs.spec
index 5945cb8..233a2ba 100644
--- a/jcifs.spec
+++ b/jcifs.spec
@@ -1,6 +1,6 @@
Name: jcifs
Version: 1.3.17
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Common Internet File System Client in 100% Java
Group: Development/Libraries
License: LGPLv2+ and BSD
@@ -98,6 +98,9 @@ cp -pr examples/*.java %{buildroot}%{_datadir}/%{name}/examples
%doc LICENSE.txt
%changelog
+* Fri Nov 16 2012 gil cattaneo <puntogil(a)libero.it> 1.3.17-6
+- rebuilt
+
* Mon Nov 12 2012 gil cattaneo <puntogil(a)libero.it> 1.3.17-5
- fixed rhbz#875685 (Incorrect license tag)
11 years, 7 months
[scirenderer] Use tee instead of cat to print out the jar path
by Clément David
commit b077c90b4ead1ecb6d9281cc8d408d018c927906
Author: Clément DAVID <clement.david(a)scilab-enterprises.com>
Date: Fri Nov 16 11:53:19 2012 +0100
Use tee instead of cat to print out the jar path
- rebuilt
scirenderer.spec | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/scirenderer.spec b/scirenderer.spec
index ae1732a..c8b2b78 100644
--- a/scirenderer.spec
+++ b/scirenderer.spec
@@ -1,6 +1,6 @@
Name: scirenderer
Version: 1.0.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A Java rendering library based on JoGL
License: CeCILL
@@ -39,7 +39,7 @@ This package contains the API documentation for %{name}.
%setup -q
# Update path according to the Fedora Guidelines
-cat >scirenderer-libs.properties << EOF
+tee >scirenderer-libs.properties << EOF
jogl2.jar = %{_libdir}/jogl2/jogl2.jar
gluegen2-rt.jar = %{_libdir}/gluegen2/gluegen2-rt.jar
jlatexmath.jar = %{_javadir}/jlatexmath.jar
@@ -76,6 +76,10 @@ cp -pr docs/* %{buildroot}%{_javadocdir}/%{name}
%doc CHANGES
%changelog
+* Fri Nov 16 2012 Clément David <c.david86(a)gmail.com> - 1.0.2-2
+- Use tee instead of cat to print out the jar path
+- rebuilt
+
* Tue Oct 02 2012 Clément David <c.david86(a)gmail.com> - 1.0.2-1
- Update version
11 years, 7 months