[cal10n] Fix for OpenJDK 7 build.
Alexander Kurtakov
akurtakov at fedoraproject.org
Sat Jan 28 13:31:38 UTC 2012
commit 6b73a2311d9390d0e058219a36d5dfbd629c0cda
Author: Alexander Kurtakov < <akurtako at redhat.com>
Date: Sat Jan 28 15:31:13 2012 +0200
Fix for OpenJDK 7 build.
- Adapt to current guidelines.
cal10n.spec | 25 ++++++++++---------------
1 files changed, 10 insertions(+), 15 deletions(-)
---
diff --git a/cal10n.spec b/cal10n.spec
index 954e670..a81f110 100644
--- a/cal10n.spec
+++ b/cal10n.spec
@@ -1,6 +1,6 @@
Name: cal10n
Version: 0.7.4
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: Compiler assisted localization library (CAL10N)
Group: Development/Libraries
@@ -28,8 +28,6 @@ BuildRequires: maven-surefire-plugin
BuildRequires: maven-surefire-provider-junit4
Requires: java
-Requires(post): jpackage-utils >= 1.7.3
-Requires(postun): jpackage-utils >= 1.7.3
%description
Compiler Assisted Localization, abbreviated as CAL10N (pronounced as "calion")
@@ -67,7 +65,7 @@ find . -name "*.jar" | xargs rm
%patch0
%build
-mvn-rpmbuild install javadoc:aggregate
+mvn-rpmbuild -Dproject.build.sourceEncoding=ISO-8859-1 install javadoc:aggregate
%install
@@ -78,11 +76,6 @@ install -m 644 cal10n-api/target/cal10n-api-%{version}.jar \
install -m 644 maven-cal10n-plugin/target/maven-cal10n-plugin-%{version}.jar \
%{buildroot}%{_javadir}/%{name}/maven-cal10n-plugin.jar
-
-%add_to_maven_depmap ch.qos.cal10n cal10n-parent %{version} JPP/%{name} cal10n-parent
-%add_to_maven_depmap ch.qos.cal10n cal10n-api %{version} JPP/%{name} cal10n-api
-%add_to_maven_depmap ch.qos.cal10n maven-cal10n-plugin %{version} JPP/%{name} maven-cal10n-plugin
-
# poms
install -d -m 755 %{buildroot}%{_mavenpomdir}
install -pm 644 pom.xml \
@@ -92,16 +85,14 @@ install -pm 644 cal10n-api/pom.xml \
install -pm 644 maven-cal10n-plugin/pom.xml \
%{buildroot}%{_mavenpomdir}/JPP.%{name}-maven-cal10n-plugin.pom
+%add_maven_depmap JPP.%{name}-%{name}-parent.pom
+%add_maven_depmap JPP.%{name}-%{name}-api.pom %{name}/cal10n-api.jar
+%add_maven_depmap JPP.%{name}-maven-cal10n-plugin.pom %{name}/maven-cal10n-plugin.jar
+
# javadoc
install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
%pre javadoc
# workaround for rpm bug 646523
[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
@@ -123,6 +114,10 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%{_javadocdir}/%{name}
%changelog
+* Sat Jan 28 2012 Alexander Kurtakov <akurtako at redhat.com> 0.7.4-8
+- Fix for OpenJDK 7 build.
+- Adapt to current guidelines.
+
* Thu Jan 12 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.4-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
More information about the scm-commits
mailing list