[jchardet] Update to current Java guidelines

Orion Poplawski orion at fedoraproject.org
Wed Jun 12 20:23:52 UTC 2013


commit 1f9ee432a09f01afe31c9fed355eef36d42bcbd2
Author: Orion Poplawski <orion at nwra.com>
Date:   Wed Jun 12 14:23:43 2013 -0600

    Update to current Java guidelines

 jchardet.spec |   36 ++++++++----------------------------
 1 files changed, 8 insertions(+), 28 deletions(-)
---
diff --git a/jchardet.spec b/jchardet.spec
index beae168..17965f1 100644
--- a/jchardet.spec
+++ b/jchardet.spec
@@ -1,6 +1,6 @@
 Name:           jchardet
 Version:        1.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Java port of Mozilla's automatic character set detection algorithm
 
 Group:          Development/Libraries
@@ -16,8 +16,6 @@ BuildRequires:  jpackage-utils
 
 Requires:       jpackage-utils
 Requires:       java
-Requires(post):   jpackage-utils
-Requires(postun): jpackage-utils
 
 %description
 jchardet is a java port of the source from Mozilla's automatic charset
@@ -52,41 +50,23 @@ mkdir -p src/main/java/org/mozilla/intl/chardet
 mv src/*java src/main/java/org/mozilla/intl/chardet
 
 %build
-mvn-rpmbuild install javadoc:aggregate
+%mvn_build
 
 %install
-# jars
-install -d -m 755 %{buildroot}%{_javadir}
-install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
+%mvn_install
 
-%add_to_maven_depmap net.sourceforge.jchardet %{name} %{version} JPP %{name}
 
-# javadoc
-install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
-cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
-
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
-
-%files
+%files -f .mfiles
 %doc LICENSE
-%{_mavendepmapfragdir}/%{name}
-%{_mavenpomdir}/JPP-%{name}.pom
-%{_javadir}/%{name}.jar
-
 
-%files javadoc
+%files javadoc -f .mfiles-javadoc
 %doc LICENSE
-%{_javadocdir}/%{name}
 
 
 %changelog
+* Wed Jun 12 2013 Orion Poplawski <orion at cora.nwra.com> - 1.1-7
+- Update to current Java guidelines
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 


More information about the scm-commits mailing list