[juniversalchardet] fix Url and Source0 tag

gil gil at fedoraproject.org
Sun Mar 15 20:01:25 UTC 2015


commit d0ec0dec5ce3fb51ec7bf11917e72b529584ef01
Author: gil <puntogil at libero.it>
Date:   Sun Mar 15 21:00:09 2015 +0100

    fix Url and Source0 tag

 juniversalchardet.spec | 37 ++++++++++++++++++-------------------
 1 file changed, 18 insertions(+), 19 deletions(-)
---
diff --git a/juniversalchardet.spec b/juniversalchardet.spec
index cac6427..e9b29b8 100644
--- a/juniversalchardet.spec
+++ b/juniversalchardet.spec
@@ -1,22 +1,22 @@
+%global githash 3fd330c443272699cd8ba5d7da7e56c27a567ec1
 Name:          juniversalchardet
 Version:       1.0.3
-Release:       4%{?dist}
+Release:       5%{?dist}
 Summary:       A Java port of Mozilla's universalchardet
 # ALL files are under MPL (v1.1) GPL license
 # build.xml and c/* under MPL 1.1/GPL 2.0/LGPL 2.1 license
 License:       MPLv1.1 or GPLv2+ or LGPLv2+
-URL:           http://code.google.com/p/juniversalchardet/
-Source0:       http://juniversalchardet.googlecode.com/files/%{name}-%{version}.tar.gz
+URL:           https://github.com/thkoch2001/juniversalchardet
+Source0:       https://github.com/thkoch2001/juniversalchardet/archive/%{githash}/%{name}-%{githash}.tar.gz
 Source1:       http://repo1.maven.org/maven2/com/googlecode/%{name}/%{name}/%{version}/%{name}-%{version}.pom
 # added javadoc task
 # fix example build
 Patch0:        %{name}-1.0.3-build.patch
 
-BuildRequires: java-devel
-BuildRequires: javapackages-tools
 BuildRequires: ant
+BuildRequires: java-devel
+BuildRequires: javapackages-local
 
-Requires:      javapackages-tools
 BuildArch:     noarch
 
 %description
@@ -30,12 +30,14 @@ Summary:       Javadoc for %{name}
 This package contains javadoc for %{name}.
 
 %prep
-%setup -q -n %{name}
+%setup -q -n %{name}-%{githash}
 find . -name "*.class" -delete
 find . -name "*.jar" -delete
 
 %patch0 -p0
 
+sed -i 's/1.5/1.6/' build.xml
+
 sed -i 's/\r//' readme.txt
 
 %build
@@ -43,28 +45,25 @@ sed -i 's/\r//' readme.txt
 %ant dist javadoc example
 
 %install
+%mvn_artifact %{SOURCE1} dist/%{name}-%{version}.jar
+%mvn_file com.googlecode.%{name}:%{name} %{name}
+%mvn_install -J dist/docs
 
-mkdir -p %{buildroot}%{_javadir}
-install -pm 644 dist/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
-install -pm 644 dist/%{name}-example-%{version}.jar %{buildroot}%{_javadir}/%{name}-example.jar
-
-mkdir -p %{buildroot}%{_mavenpomdir}
-install -pm 644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap
-
-mkdir -p %{buildroot}%{_javadocdir}/%{name}
-cp -pr dist/docs/* %{buildroot}%{_javadocdir}/%{name}
+install -pm 644 dist/%{name}-example-%{version}.jar \
+ %{buildroot}%{_javadir}/%{name}-example.jar
 
 %files -f .mfiles
 %{_javadir}/%{name}-example.jar
 %doc readme.txt
 %license MPL-1.1.txt
 
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
 %license MPL-1.1.txt
 
 %changelog
+* Sun Mar 15 2015 gil cattaneo <puntogil at libero.it> 1.0.3-5
+- fix Url and Source0 tag
+
 * Mon Feb 09 2015 gil cattaneo <puntogil at libero.it> 1.0.3-4
 - introduce license macro
 


More information about the scm-commits mailing list