[maven-surefire] Get rid of custom depmap
by Mikolaj Izdebski
commit 695faffab71e5b006c768d00b6528c37fe538f10
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Tue Jan 29 15:44:51 2013 +0100
Get rid of custom depmap
maven-surefire.spec | 18 +++++++++++++-----
shadefire-depmap.xml | 10 ----------
2 files changed, 13 insertions(+), 15 deletions(-)
---
diff --git a/maven-surefire.spec b/maven-surefire.spec
index 49833d5..046a402 100644
--- a/maven-surefire.spec
+++ b/maven-surefire.spec
@@ -1,6 +1,6 @@
Name: maven-surefire
Version: 2.13
-Release: 1%{?dist}
+Release: 2%{?dist}
Epoch: 0
Summary: Test framework project
License: ASL 2.0 and CPL
@@ -9,7 +9,6 @@ URL: http://maven.apache.org/surefire/
Source0: http://repo2.maven.org/maven2/org/apache/maven/surefire/surefire/%{versio...
Source2: http://junit.sourceforge.net/cpl-v10.html
-Source3: shadefire-depmap.xml
BuildArch: noarch
BuildRequires: apache-commons-lang3
@@ -123,12 +122,18 @@ cp -p %{SOURCE2} .
%pom_add_dep org.apache.maven:maven-compat maven-surefire-common
%pom_disable_module surefire-shadefire
+for module in . maven-failsafe-plugin maven-surefire-common \
+ maven-surefire-plugin surefire-api surefire-booter \
+ surefire-grouper surefire-providers \
+ surefire-setup-integration-tests; do
+ %pom_remove_dep org.apache.maven.surefire:surefire-shadefire $module
+done
%build
-# tests turned off because they need jmock
-%mvn_package ":*{surefire-plugin,report-plugin,junit,testng,failsafe-plugin}*" @1
+%mvn_package ":*{surefire-plugin,report-plugin}*" @1
+%mvn_package ":*{junit,testng,failsafe-plugin}*" @1
%mvn_package ":*tests*" __noinstall
-export XMVN_RESOLV_DEPMAPS=",%{SOURCE3}"
+# tests turned off because they need jmock
%mvn_build -f
%install
@@ -150,6 +155,9 @@ export XMVN_RESOLV_DEPMAPS=",%{SOURCE3}"
%doc LICENSE NOTICE cpl-v10.html
%changelog
+* Tue Jan 29 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0:2.13-2
+- Get rid of custom depmap
+
* Wed Jan 23 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0:2.13-1
- Update to upstream version 2.13
11 years, 3 months
[plexus-cipher] Fixed URL (Resolves: #880322)
by Stanislav Ochotnicky
commit 7e1ec7cf58eda546efa3bb1c4f3f6e93ec1e7eea
Author: Michal Srb <msrb(a)redhat.com>
Date: Wed Jan 2 16:36:59 2013 +0100
Fixed URL (Resolves: #880322)
Signed-off-by: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
plexus-cipher.spec | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
---
diff --git a/plexus-cipher.spec b/plexus-cipher.spec
index 985de38..1bf1427 100644
--- a/plexus-cipher.spec
+++ b/plexus-cipher.spec
@@ -1,13 +1,16 @@
Name: plexus-cipher
Version: 1.5
-Release: 11%{?dist}
+Release: 12%{?dist}
Summary: Plexus Cipher: encryption/decryption Component
Group: Development/Libraries
License: ASL 2.0
-URL: http://spice.sonatype.org
-#svn export http://svn.sonatype.org/spice/tags/plexus-cipher-1.5
-#tar zcf plexus-cipher-1.5.tar.gz plexus-cipher-1.5
+# project moved to GitHub and it looks like there is no official website anymore
+URL: https://github.com/sonatype/plexus-cipher
+# git clone https://github.com/sonatype/plexus-cipher.git
+# cd plexus-cipher/
+# there is no tag 1.5 in git repository
+# git archive --format tar 6df2b65 | gzip -9 > plexus-cipher-1.5.tar.gz
Source0: %{name}-%{version}.tar.gz
Source1: http://apache.org/licenses/LICENSE-2.0.txt
@@ -88,6 +91,9 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/plexus/%{name}/
%{_javadocdir}/plexus/%{name}
%changelog
+* Wed Jan 02 2013 Michal Srb <msrb(a)redhat.com> - 1.5-12
+- Fixed URL (Resolves: #880322)
+
* Tue Nov 27 2012 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1.5-11
- Improve randomness of PBECipher
- Resolves: rhbz#880279
11 years, 3 months
[Bug 894613] New: Cannot install KDE alongside Gnome
by Red Hat Bugzilla
Product: Fedora
https://bugzilla.redhat.com/show_bug.cgi?id=894613
Bug ID: 894613
Summary: Cannot install KDE alongside Gnome
Product: Fedora
Version: 18
Component: apache-commons-modeler
Severity: medium
Priority: unspecified
Reporter: lsatenstein(a)yahoo.com
Description of problem:
Fedora 18 RC4 live Installation does not allow secondary KDE user interface.
Version-Release number of selected component (if applicable):
Gnome 3.6.2
How reproducible:
Tried to install KDE as an optional (alongside) User Interface using the Live
CD installation on a netbook that does not have a DVD player. The netbook is a
dual core atom 64bit system
Steps to Reproduce:
1. yum install "*KDE*"
2. yum install "*kde*"
3. reboot
Actual results:
No ability to select KDE.
No menu selection for
Expected results:
Expected KDE as alternative to Gnome
Additional info:
This bug is created from my netbook, which does not have a DVD reader.
Therefore the live image was used.
With the live image, there was no ability to select applications that I would
like to include
In Gnome Software Install, KDE and Gnome Desktop icons are empty. When all
icons are displayed, there is no category marked Programming, as is available
with the full DVD.
I will attempt the following:
Create a persistant partition of 5 gigs on the netbook disk.
Download the DVD Fedora 18 image to this partition
reboot the system using the flashdrive created with liveusb-creator
point anaconda to the iso image on the other partition.
Hopefully I will have a full Gnome 3.6.4 system to replace the 3.6.2 on the
liveCD
--
You are receiving this mail because:
You are on the CC list for the bug.
Unsubscribe from this bug https://bugzilla.redhat.com/token.cgi?t=C41GWoms6a&a=cc_unsubscribe
11 years, 3 months
[maven-shared-jar] Removed LICENSE.txt from sources
by tradej@fedoraproject.org
commit 26b5065ae5e4a1f8c0dbcc3019b47f7756af162d
Author: Tomas Radej <tradej(a)redhat.com>
Date: Mon Jan 28 10:39:42 2013 +0100
Removed LICENSE.txt from sources
sources | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
---
diff --git a/sources b/sources
index b774626..5c79609 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-3b83ef96387f14655fc854ddc3c6bd57 LICENSE-2.0.txt
f71afcad0365eabf07fa151682b2620a maven-shared-jar-1.1-source-release.zip
11 years, 3 months
[scirenderer] Update version to 1.0.5
by Clément David
commit 6a233c68760400bd1a814792af824a0ee580d4eb
Author: Clément DAVID <clement.david(a)scilab-enterprises.com>
Date: Fri Jan 25 16:59:57 2013 +0100
Update version to 1.0.5
.gitignore | 1 +
scirenderer.spec | 13 ++++++++-----
sources | 2 +-
3 files changed, 10 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b1ca40c..68655fb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ scirenderer-*.src.rpm
/scirenderer-*.tar.gz
*~
+clog
diff --git a/scirenderer.spec b/scirenderer.spec
index 1ce13b8..a704e19 100644
--- a/scirenderer.spec
+++ b/scirenderer.spec
@@ -1,6 +1,6 @@
Name: scirenderer
-Version: 1.0.4
-Release: 2%{?dist}
+Version: 1.0.5
+Release: 1%{?dist}
Summary: A Java rendering library based on JoGL
License: CeCILL
@@ -40,9 +40,9 @@ This package contains the API documentation for %{name}.
# Update path according to the Fedora Guidelines
tee scirenderer-libs.properties << EOF
-jogl2.jar=$(build-classpath jogl2)
-gluegen2-rt.jar=$(build-classpath gluegen2-rt)
-jlatexmath.jar=$(build-classpath jlatexmath.jar)
+jogl2.jar=%{_jnidir}/jogl2.jar
+gluegen2-rt.jar=%{_jnidir}/gluegen2-rt.jar
+jlatexmath.jar=%{_javadir}/jlatexmath.jar
EOF
# fix file-not-utf8
@@ -75,6 +75,9 @@ cp -pr docs/* %{buildroot}%{_javadocdir}/%{name}
%doc CHANGES
%changelog
+* Fri Jan 25 2013 Clément David <c.david86(a)gmail.com> - 1.0.5-1
+- Update version to 1.0.5
+
* Thu Jan 17 2013 Clément David <c.david86(a)gmail.com> - 1.0.4-2
- Update version
diff --git a/sources b/sources
index 901d445..25fbd45 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cd7eadaeca151c709477c9f97006a0d0 scirenderer-1.0.3.tar.gz
+8d8dc4507aae69c4a0374a376cfcbf46 scirenderer-1.0.5.tar.gz
11 years, 3 months
[plexus-mail-sender] Build with xmvn
by Michal Srb
commit a58466bfb04bf41d322d9abffce806c98e3f966d
Author: Michal Srb <msrb(a)redhat.com>
Date: Fri Jan 25 13:23:15 2013 +0100
Build with xmvn
- Fixed pom_ macro
plexus-mail-sender.spec | 53 +++++++++++-----------------------------------
1 files changed, 13 insertions(+), 40 deletions(-)
---
diff --git a/plexus-mail-sender.spec b/plexus-mail-sender.spec
index c215017..93a9946 100644
--- a/plexus-mail-sender.spec
+++ b/plexus-mail-sender.spec
@@ -32,7 +32,7 @@
Name: plexus-mail-sender
Version: 1.0
-Release: 0.a2.22%{?dist}
+Release: 0.a2.23%{?dist}
Epoch: 0
Summary: Plexus Mail Sender
License: MIT and ASL 1.1
@@ -49,7 +49,7 @@ Source0: plexus-mail-sender-%{version}-a2-src.tar.gz
Patch0: %{name}-clarifylicense.patch
BuildRequires: jpackage-utils >= 0:1.6
-BuildRequires: maven
+BuildRequires: xmvn
BuildRequires: maven-compiler-plugin
BuildRequires: maven-install-plugin
BuildRequires: maven-jar-plugin
@@ -62,8 +62,6 @@ BuildRequires: saxon
BuildRequires: saxon-scripts
BuildRequires: java-devel >= 1:1.6.0
-Requires: java
-Requires: jpackage-utils
BuildArch: noarch
@@ -80,11 +78,11 @@ Plexus component provides SMTP transport.
%package javadoc
Summary: Javadoc for %{name}
Group: Documentation
-Requires: jpackage-utils
%description javadoc
Javadoc for %{name}.
+
%prep
%setup -q -n %{name}-%{version}-a2
%patch0 -p3
@@ -93,7 +91,7 @@ mv release-pom.xml pom.xml
pushd plexus-mail-senders
mv release-pom.xml pom.xml
-%pom_xpath_remove "modules/module [text()='plexus-mail-sender-test']"
+%pom_disable_module plexus-mail-sender-test
for mod in javamail simple test;do
pushd %{name}-$mod
mv release-pom.xml pom.xml
@@ -107,47 +105,22 @@ find . -iname 'pom.xml' -exec sed -i \
%build
-mvn-rpmbuild -Dmaven.test.skip=true \
- package javadoc:aggregate
+%mvn_package ":*senders" __noinstall
+%mvn_build -f
%install
-# jars
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/plexus
-install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-pushd plexus-mail-senders
-for mod in javamail simple;do
- pushd %{name}-$mod
- install -pm 644 target/%{name}-$mod-%{namedversion}*.jar \
- $RPM_BUILD_ROOT%{_javadir}/plexus/mail-sender-$mod.jar
- install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.plexus-mail-sender-$mod.pom
- %add_maven_depmap JPP.%{name}-$mod.pom plexus/mail-sender-$mod.jar -a "org.codehaus.plexus:plexus-mail-sender-$mod"
- popd
-done
-popd
-
-install -pm 644 \
- %{name}-api/target/%{name}-api-%{namedversion}*.jar \
- $RPM_BUILD_ROOT%{_javadir}/plexus/mail-sender-api.jar
-install -pm 644 %{name}-api/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.plexus-mail-sender-api.pom
-%add_maven_depmap JPP.%{name}-api.pom plexus/mail-sender-api.jar -a "org.codehaus.plexus:plexus-mail-sender-api"
+%mvn_install
-install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.plexus-mail-sender.pom
-%add_maven_depmap JPP.%{name}.pom -a "org.codehaus.plexus:plexus-mail-sender"
+%files -f .mfiles
-# javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -pr target/site/apidocs/* \
- $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
-%files
-%{_mavendepmapfragdir}/%{name}
-%{_mavenpomdir}/*pom
-%{_javadir}/plexus/*jar
-
-%files javadoc
-%{_javadocdir}/%{name}
%changelog
+* Thu Jan 24 2013 Michal Srb <msrb(a)redhat.com> - 0:1.0-0.a2.23
+- Build with xmvn
+- Fixed pom_ macro
+
* Thu Oct 11 2012 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0:1.0-0.a2.22
- Do not build test submodule to simplify dependencies
11 years, 3 months
[jogl2] Upgrade to the Java packaging draft (JNI jar/so location)
by Clément David
commit 9e353f56b63c5b7c1e8e08f0a970a7012866655f
Author: Clément DAVID <clement.david(a)scilab-enterprises.com>
Date: Fri Jan 25 16:33:25 2013 +0100
Upgrade to the Java packaging draft (JNI jar/so location)
- Avoid using build-classpath to ease branch merge (and jnidir changes)
jogl2.spec | 30 ++++++++++++++++--------------
1 files changed, 16 insertions(+), 14 deletions(-)
---
diff --git a/jogl2.spec b/jogl2.spec
index 0a9f64b..18309cc 100644
--- a/jogl2.spec
+++ b/jogl2.spec
@@ -106,7 +106,7 @@ for file in README.txt; do
done
# git executable should not be used, use true (to avoid checkout) instead
-sed -i 's/executable="git"/executable="true"/' make/build.xml
+sed -i 's/executable="git"/executable="true"/' make/build-common.xml
%build
cd make
@@ -114,13 +114,13 @@ ant -Dc.compiler.debug=true \
-Djavacdebug=false \
-Dcommon.gluegen.build.done=true \
\
- -Dantlr.jar=$(build-classpath antlr.jar) \
- -Djunit.jar=$(build-classpath junit.jar) \
- -Dant.jar=$(build-classpath ant.jar) \
- -Dant-junit.jar=/usr/share/java/ant/ant-junit.jar \
- -Dgluegen.jar=$(build-classpath gluegen2) \
- -Dgluegen-rt.jar=%{_libdir}/gluegen2/gluegen2-rt.jar \
- -Dswt.jar=$(build-classpath swt.jar) \
+ -Dantlr.jar=%{_javadir}/antlr.jar \
+ -Djunit.jar=%{_javadir}/junit.jar \
+ -Dant.jar=%{_javadir}/ant.jar \
+ -Dant-junit.jar=%{_javadir}/ant/ant-junit.jar \
+ -Dgluegen.jar=%{_javadir}/gluegen2.jar \
+ -Dgluegen-rt.jar=%{_jnidir}/gluegen2-rt.jar \
+ -Dswt.jar=%{_libdir}/eclipse/swt.jar \
\
-Djavadoc.link=%{_javadocdir}/java \
-Dgluegen.link=%{_javadocdir}/gluegen2 \
@@ -129,12 +129,13 @@ ant -Dc.compiler.debug=true \
javadoc.all
%install
-mkdir -p %{buildroot}%{_libdir}/%{name} \
+mkdir -p %{buildroot}%{_javadir}/%{name} \
+ %{buildroot}%{_libdir}/%{name} \
%{buildroot}%{_jnidir}
-install build/jar/jogl-all.jar %{buildroot}%{_libdir}/%{name}/%{name}.jar
+install build/jar/jogl-all.jar %{buildroot}%{_jnidir}/%{name}.jar
+ln -s ../../..%{_jnidir}/%{name}.jar %{buildroot}%{_libdir}/%{name}/
install -t %{buildroot}%{_libdir}/%{name}/ build/lib/*.so
-ln -s ../%{name}/%{name}.jar %{buildroot}%{_jnidir}/
# Provide JPP pom
mkdir -p %{buildroot}%{_mavenpomdir}
@@ -156,7 +157,7 @@ find %{buildroot}%{_docdir}/%{name} -name '*.html' \
%files
%doc README.txt LICENSE.txt CHANGELOG.txt
%{_libdir}/%{name}
-%{_jnidir}/*
+%{_jnidir}/%{name}.jar
%{_mavendepmapfragdir}/%{name}
%{_mavenpomdir}/JPP-%{name}.pom
@@ -170,7 +171,8 @@ find %{buildroot}%{_docdir}/%{name} -name '*.html' \
%changelog
* Mon Jan 21 2013 Clément David <c.david86(a)gmail.com> - 2.0-0.7.rc11
-- Use build-classpath to locate swt.jar
+- Upgrade to the Java packaging draft (JNI jar/so location)
+- Avoid using build-classpath to ease branch merge (and jnidir changes)
* Fri Jan 04 2013 Clément David <c.david86(a)gmail.com> - 2.0-0.6.rc11
- Update version
@@ -185,7 +187,7 @@ find %{buildroot}%{_docdir}/%{name} -name '*.html' \
* Tue Oct 02 2012 Clément David <c.david86(a)gmail.com> - 2.0-0.3.rc10
- Provide a pom file
-* Mon Sep 20 2012 Clément David <c.david86(a)gmail.com> - 2.0-0.2.rc10
+* Thu Sep 20 2012 Clément David <c.david86(a)gmail.com> - 2.0-0.2.rc10
- Add javadoc full subpackage
- Provide symlink on %%{jnidir}
11 years, 3 months