[jpathwatch] fix build on non-x86 arches
by Dan Horák
commit 3f06210171d7a1dba5c9702d5b8c05c7786d2474
Author: Dan Horák <dan(a)danny.cz>
Date: Wed Jul 20 13:06:21 2011 +0200
fix build on non-x86 arches
jpathwatch.spec | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/jpathwatch.spec b/jpathwatch.spec
index 9600077..4146a26 100644
--- a/jpathwatch.spec
+++ b/jpathwatch.spec
@@ -3,7 +3,7 @@
Name: jpathwatch
Version: 0.94
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Java library for monitoring directories for changes
License: GPLv2
Group: Development/Libraries
@@ -15,8 +15,6 @@ Source0: %{name}-%{version}.tar.gz
Patch0: %{name}-fsf-address.patch
-ExclusiveArch: x86_64 %{ix86}
-
BuildRequires: java-devel
BuildRequires: jpackage-utils
BuildRequires: ant
@@ -59,10 +57,10 @@ This package contains the API documentation for %{name}.
# native part
cd %{name}-native/prj/linux/%{name}-native-linux
-%ifarch x86_64
- make DEFAULTCONF=Release_x86-64bit %{?_smp_mflags}
+%ifarch x86_64 s390x sparc64 ppc64
+ make DEFAULTCONF=Release_x86-64bit %{?_smp_mflags} CXXFLAGS="%{optflags}"
%else
- make DEFAULTCONF=Release_x86-32bit %{?_smp_mflags}
+ make DEFAULTCONF=Release_x86-32bit %{?_smp_mflags} CXXFLAGS="%{optflags}"
%endif
# java part
@@ -91,6 +89,9 @@ cp -pr doc/* %{buildroot}%{_javadocdir}/%{name}
%doc %{_javadocdir}/%{name}
%changelog
+* Wed Jul 20 2011 Dan Horák <dan[at]danny.cz> - 0.94-3
+- fix build on non-x86 arches
+
* Thu Jul 07 2011 Jaromir Capik <jcapik(a)redhat.com> - 0.94-2
- Architecture dependent jar file moved to %{_jnidir}
12 years, 10 months
[maven-jxr] BR maven-surefire-provider-junit4
by Alexander Kurtakov
commit 5fc6ea82dce47010f2c430e8770ca168de5691d5
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Wed Jul 20 13:56:59 2011 +0300
BR maven-surefire-provider-junit4
maven-jxr.spec | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/maven-jxr.spec b/maven-jxr.spec
index 94ecd0b..469396f 100644
--- a/maven-jxr.spec
+++ b/maven-jxr.spec
@@ -55,7 +55,7 @@ BuildRequires: maven-javadoc-plugin
BuildRequires: maven-site-plugin
BuildRequires: maven-plugin-plugin
BuildRequires: maven-doxia-sitetools
-BuildRequires: maven-surefire-provider-junit
+BuildRequires: maven-surefire-provider-junit4
BuildRequires: maven-plugin-testing-harness
BuildRequires: junit >= 3.8.2
BuildRequires: apache-commons-collections >= 3.1
12 years, 10 months
[maven-jxr] Update to upstream 2.3. release.
by Alexander Kurtakov
commit 5d10f40c4969db37455e32a31eaf2b7792cc4fd0
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Wed Jul 20 13:46:33 2011 +0300
Update to upstream 2.3. release.
.gitignore | 1 +
add-oro-dep.patch | 13 +++++++++++++
maven-jxr-jpp-depmap.xml | 14 --------------
maven-jxr.spec | 41 ++++++++++-------------------------------
sources | 2 +-
5 files changed, 25 insertions(+), 46 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4f467e2..4895980 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
maven-jxr-2.1.tar.bz2
jxr-2.2-source-release.zip
+jxr-2.3-source-release.zip
diff --git a/add-oro-dep.patch b/add-oro-dep.patch
new file mode 100644
index 0000000..3ff990f
--- /dev/null
+++ b/add-oro-dep.patch
@@ -0,0 +1,13 @@
+--- maven-jxr/pom.xml.oro 2011-07-15 12:48:50.000000000 +0300
++++ maven-jxr/pom.xml 2011-07-20 13:37:35.699740540 +0300
+@@ -112,6 +112,10 @@ under the License.
+ <artifactId>plexus-utils</artifactId>
+ <version>1.5.8</version>
+ </dependency>
++ <dependency>
++ <groupId>oro</groupId>
++ <artifactId>oro</artifactId>
++ </dependency>
+
+ <dependency>
+ <groupId>org.apache.velocity</groupId>
diff --git a/maven-jxr.spec b/maven-jxr.spec
index 6126bb5..94ecd0b 100644
--- a/maven-jxr.spec
+++ b/maven-jxr.spec
@@ -29,21 +29,21 @@
#
Name: maven-jxr
-Version: 2.2
-Release: 3%{?dist}
+Version: 2.3
+Release: 1%{?dist}
Epoch: 0
Summary: Source cross referencing tool
License: ASL 2.0
Group: Development/Tools
URL: http://maven.apache.org/doxia/
-Source0: http://repo2.maven.org/maven2/org/apache/maven/jxr/jxr/2.2/jxr-2.2-source...
-Source1: %{name}-jpp-depmap.xml
+Source0: http://repo2.maven.org/maven2/org/apache/maven/jxr/jxr/%{version}/jxr-%{v...
+Patch0: add-oro-dep.patch
BuildArch: noarch
BuildRequires: jpackage-utils >= 0:1.7.2
-BuildRequires: maven2 >= 2.0.4
+BuildRequires: maven
BuildRequires: maven-resources-plugin
BuildRequires: maven-compiler-plugin
BuildRequires: maven-resources-plugin
@@ -69,9 +69,6 @@ Requires: jakarta-oro >= 2.0.8
Requires: plexus-utils >= 1.2
Requires: velocity >= 1.4
-Requires(post): jpackage-utils >= 0:1.7.2
-Requires(postun): jpackage-utils >= 0:1.7.2
-
%description
Maven JXR is a source cross referencing tool.
@@ -93,26 +90,20 @@ Maven plugin for JXR.
%prep
%setup -q -n jxr-%{version}
+%patch0
%build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mkdir -p $MAVEN_REPO_LOCAL
-
# The test failures seem to have something to do with:
# http://jira.codehaus.org/browse/MCHANGES-88
# We can investigate when we upgrade to 2.2.x to see if they still occur.
# Update: Seems that tests fail because they are trying to access
# plexus component descriptors which seem to be different?
- mvn-jpp \
- -e \
- -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
- -Dmaven2.jpp.depmap.file=%{SOURCE1} \
+mvn-rpmbuild \
-Dmaven.test.failure.ignore=true \
install javadoc:aggregate
%install
-rm -rf $RPM_BUILD_ROOT
# jars/poms
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
install -d -m 755 $RPM_BUILD_ROOT/%{_mavenpomdir}
@@ -139,40 +130,28 @@ 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
-
-%post -n maven-plugin-jxr
-%update_maven_depmap
-
-%postun -n maven-plugin-jxr
-%update_maven_depmap
-
%pre javadoc
# workaround for rpm bug, can be removed in F-17
[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%files
-%defattr(-,root,root,-)
%{_javadir}/%{name}*.jar
%{_mavenpomdir}/JPP-%{name}-parent.pom
%{_mavenpomdir}/JPP-%{name}.pom
%{_mavendepmapfragdir}/%{name}
%files javadoc
-%defattr(-,root,root,-)
%doc %{_javadocdir}/*
%files -n maven-plugin-jxr
-%defattr(-,root,root,-)
%{_mavenpomdir}/JPP-maven-plugin-jxr.pom
%{_javadir}/maven-plugin-jxr*.jar
%changelog
+* Wed Jul 20 2011 Alexander Kurtakov <akurtako(a)redhat.com> 0:2.3-1
+- Update to upstream 2.3. release.
+
* Sun Mar 13 2011 Mat Booth <fedora(a)matbooth.co.uk> 0:2.2-3
- Maven plug-in sub-package should require the core package.
- Use _mavenpomdir macro.
diff --git a/sources b/sources
index 427e44f..3c3aad0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-991f20e0ce9e8d16df9bfaf14fd4f75e jxr-2.2-source-release.zip
+be005f2b21ba29508369b8c1ab211a9e jxr-2.3-source-release.zip
12 years, 10 months
[apache-commons-daemon] Add maven-surefire-provider-junit to BR
by Stanislav Ochotnicky
commit f7adb2b13a0384821ad6868cff008e3ca50c2ce4
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Wed Jul 20 11:43:45 2011 +0200
Add maven-surefire-provider-junit to BR
apache-commons-daemon.spec | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
---
diff --git a/apache-commons-daemon.spec b/apache-commons-daemon.spec
index 2878e1f..16e4509 100644
--- a/apache-commons-daemon.spec
+++ b/apache-commons-daemon.spec
@@ -17,6 +17,7 @@ BuildRequires: java-devel >= 1:1.6.0
BuildRequires: jpackage-utils
BuildRequires: maven
BuildRequires: apache-commons-parent
+BuildRequires: maven-surefire-provider-junit
BuildRequires: xmlto
Requires: java >= 1:1.6.0
@@ -137,6 +138,7 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%changelog
* Wed Jul 20 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 1.0.6-1
- Update to latest upstream (1.0.6)
+- Cleanups according to new guidelines
* Mon May 9 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 1.0.5-5
- Use mvn-rpmbuild instead of mvn-local (changes in maven)
12 years, 10 months
[apache-commons-daemon] Update to latest upstream (1.0.6)
by Stanislav Ochotnicky
commit dc9f7d729b1cfbe9cae03473963e14cba0c599ac
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Wed Jul 20 11:18:00 2011 +0200
Update to latest upstream (1.0.6)
.gitignore | 1 +
0001-execve-path-warning.patch | 8 ++++----
0002-ppc64-configure.patch | 10 +++++-----
0003-s390x-configure.patch | 27 ++++++++++++++++++++-------
apache-commons-daemon.spec | 32 +++++++++++---------------------
sources | 2 +-
6 files changed, 42 insertions(+), 38 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 94847a5..e683d5c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ commons-daemon-1.0.2-src.tar.gz
/commons-daemon-1.0.3-src.tar.gz
/commons-daemon-1.0.4-src.tar.gz
/commons-daemon-1.0.5-src.tar.gz
+/commons-daemon-1.0.6-src.tar.gz
diff --git a/0001-execve-path-warning.patch b/0001-execve-path-warning.patch
index 285f1ae..3a9c4d1 100644
--- a/0001-execve-path-warning.patch
+++ b/0001-execve-path-warning.patch
@@ -1,4 +1,4 @@
-From 3c89eec3132a924721882f38b8ab06ab81ad2ee8 Mon Sep 17 00:00:00 2001
+From 0de57c78cbe1666fdf78ff6522b3b0ce18f12716 Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Tue, 18 Jan 2011 14:46:21 +0100
Subject: [PATCH 1/3] execve path warning
@@ -8,10 +8,10 @@ Subject: [PATCH 1/3] execve path warning
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/src/native/unix/native/jsvc-unix.c b/src/native/unix/native/jsvc-unix.c
-index e3d9e89..72d53c2 100644
+index 1967f09..22967f1 100644
--- a/src/native/unix/native/jsvc-unix.c
+++ b/src/native/unix/native/jsvc-unix.c
-@@ -966,6 +966,15 @@ int main(int argc, char *argv[])
+@@ -1015,6 +1015,15 @@ int main(int argc, char *argv[])
char *tmp = NULL;
char *p1 = NULL;
char *p2 = NULL;
@@ -28,5 +28,5 @@ index e3d9e89..72d53c2 100644
/*
* There is no need to change LD_LIBRARY_PATH
--
-1.7.3.5
+1.7.6
diff --git a/0002-ppc64-configure.patch b/0002-ppc64-configure.patch
index 73aff13..49b1fce 100644
--- a/0002-ppc64-configure.patch
+++ b/0002-ppc64-configure.patch
@@ -1,4 +1,4 @@
-From 371ed8b175a2b7b05b5c9687b2d7fe7880524cb1 Mon Sep 17 00:00:00 2001
+From 5a66ed56d4ec20e0df41d0b06f122264ee5811af Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Tue, 18 Jan 2011 14:48:05 +0100
Subject: [PATCH 2/3] ppc64 configure
@@ -9,10 +9,10 @@ Subject: [PATCH 2/3] ppc64 configure
2 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/src/native/unix/configure b/src/native/unix/configure
-index 3929ce8..62f35d9 100755
+index 64d88bf..1fc9007 100755
--- a/src/native/unix/configure
+++ b/src/native/unix/configure
-@@ -2984,7 +2984,10 @@ $as_echo "failed" >&6; }
+@@ -2563,7 +2563,10 @@ echo "$as_me: error: Unsupported operating system \"$host_os\"" >&2;}
;;
esac
case $host_cpu in
@@ -25,7 +25,7 @@ index 3929ce8..62f35d9 100755
HOST_CPU=$host_cpu;;
sparc*)
diff --git a/src/native/unix/support/config.sub b/src/native/unix/support/config.sub
-index 93a3a14..449f3b1 100755
+index 93a3a14..449f3b1 100644
--- a/src/native/unix/support/config.sub
+++ b/src/native/unix/support/config.sub
@@ -225,7 +225,7 @@ case $basic_machine in
@@ -64,5 +64,5 @@ index 93a3a14..449f3b1 100755
basic_machine=powerpcle-unknown
;;
--
-1.7.3.4
+1.7.6
diff --git a/0003-s390x-configure.patch b/0003-s390x-configure.patch
index fd3e480..08cf4f8 100644
--- a/0003-s390x-configure.patch
+++ b/0003-s390x-configure.patch
@@ -1,7 +1,17 @@
-diff -up commons-daemon-1.0.5-src/src/native/unix/configure.s390 commons-daemon-1.0.5-src/src/native/unix/configure
---- commons-daemon-1.0.5-src/src/native/unix/configure.s390 2011-05-04 16:04:10.000000000 +0200
-+++ commons-daemon-1.0.5-src/src/native/unix/configure 2011-05-04 16:12:04.000000000 +0200
-@@ -3030,10 +3030,9 @@ $as_echo "failed" >&6; }
+From a4541056cfa275aabb9c57f0fab1ea93bb94c1f2 Mon Sep 17 00:00:00 2001
+From: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
+Date: Wed, 20 Jul 2011 11:08:48 +0200
+Subject: [PATCH 3/3] s390x configure
+
+---
+ src/native/unix/configure | 7 +++----
+ 1 files changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/src/native/unix/configure b/src/native/unix/configure
+index 1fc9007..15a74c6 100755
+--- a/src/native/unix/configure
++++ b/src/native/unix/configure
+@@ -2609,10 +2609,9 @@ echo "$as_me: error: Unsupported operating system \"$host_os\"" >&2;}
CFLAGS="$CFLAGS -DCPU=\\\"ia64\\\""
supported_os="ia64"
HOST_CPU=ia64;;
@@ -12,6 +22,9 @@ diff -up commons-daemon-1.0.5-src/src/native/unix/configure.s390 commons-daemon-
+ s390*)
+ CFLAGS="$CFLAGS -DCPU=\\\"$host_cpu\\\""
+ HOST_CPU=$host_cpu;;
- *)
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
- $as_echo "failed" >&6; }
+ arm*)
+ CFLAGS="$CFLAGS -DCPU=\\\"arm\\\""
+ supported_os="arm"
+--
+1.7.6
+
diff --git a/apache-commons-daemon.spec b/apache-commons-daemon.spec
index ad0071c..2878e1f 100644
--- a/apache-commons-daemon.spec
+++ b/apache-commons-daemon.spec
@@ -3,8 +3,8 @@
%global short_name commons-%{base_name}
Name: apache-%{short_name}
-Version: 1.0.5
-Release: 5%{?dist}
+Version: 1.0.6
+Release: 1%{?dist}
Summary: Defines API to support an alternative invocation mechanism
License: ASL 2.0
Group: Applications/System
@@ -21,8 +21,6 @@ BuildRequires: xmlto
Requires: java >= 1:1.6.0
Requires: jpackage-utils
-Requires(post): jpackage-utils
-Requires(postun): jpackage-utils
# This should go away with F-17
@@ -102,12 +100,9 @@ ln -sf %{name}.jar %{buildroot}%{_javadir}/%{short_name}.jar
# pom
-install -Dpm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{short_name}.pom
-%add_to_maven_depmap org.apache.commons %{short_name} %{version} JPP %{short_name}
+install -Dpm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
+%add_maven_depmap JPP-%{name}.pom %{name}.jar -a "org.apache.commons:%{short_name}"
-# following line is only for backwards compatibility. New packages
-# should use proper groupid org.apache.commons and also artifactid
-%add_to_maven_depmap %{short_name} %{short_name} %{version} JPP %{short_name}
# javadoc
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
@@ -119,35 +114,30 @@ cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
%files
-%defattr(-,root,root,-)
%doc LICENSE.txt PROPOSAL.html NOTICE.txt RELEASE-NOTES.txt src/samples
%doc src/docs/*
-%{_javadir}/*
-%{_mavenpomdir}/JPP-%{short_name}.pom
-%{_mavendepmapfragdir}/*
+%{_javadir}/%{name}.jar
+%{_javadir}/%{short_name}.jar
+%{_mavenpomdir}/JPP-%{name}.pom
+%{_mavendepmapfragdir}/%{name}
%files jsvc
-%defattr(-,root,root,-)
%doc LICENSE.txt
%{_bindir}/jsvc
%{_mandir}/man1/jsvc.1*
%files javadoc
-%defattr(-,root,root,-)
%doc %{_javadocdir}/%{name}
%doc LICENSE.txt
%changelog
+* Wed Jul 20 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 1.0.6-1
+- Update to latest upstream (1.0.6)
+
* Mon May 9 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 1.0.5-5
- Use mvn-rpmbuild instead of mvn-local (changes in maven)
diff --git a/sources b/sources
index 42bdb26..0993851 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2fe0a35d4a9c0338ecd45dad20f33662 commons-daemon-1.0.5-src.tar.gz
+28dc2e0a3634b2dc3605e9e6444d079f commons-daemon-1.0.6-src.tar.gz
12 years, 10 months