Attachment 582129 Details for Bug 818989 – update to 1.1.1

[patch] update to 1.1.1

0001-update-to-1.1.1.patch (text/plain), 4.61 KB, created by gil cattaneo on 2012-05-04 14:15:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: gil cattaneo

Created: 2012-05-04 14:15:59 UTC

Size: 4.61 KB

patch

obsolete

>From 3ccc7fcf7740beed1c138ad304d90bfbe5e13ff6 Mon Sep 17 00:00:00 2001
>From: gil <puntogil@libero.it>
>Date: Fri, 4 May 2012 14:06:59 +0200
>Subject: [PATCH] update to 1.1.1
>
>---
> .gitignore       |    1 +
> json_simple.spec |   96 +++++++++++++++++++++++++++---------------------------
> sources          |    2 +-
> 3 files changed, 50 insertions(+), 49 deletions(-)
>
>diff --git a/.gitignore b/.gitignore
>index 79565e9..636ef33 100644
>--- a/.gitignore
>+++ b/.gitignore
>@@ -1 +1,2 @@
> json_simple-1.1-all.zip
>+/json-simple-1.1.1-src-svn.tar.gz
>diff --git a/json_simple.spec b/json_simple.spec
>index de48d5c..9fa2001 100644
>--- a/json_simple.spec
>+++ b/json_simple.spec
>@@ -1,27 +1,30 @@
>-%global with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
> 
> Name:           json_simple
>-Version:        1.1
>-Release:        4%{?dist}
>+Version:        1.1.1
>+Release:        1%{?dist}
> Summary:        Simple Java toolkit for JSON
> 
>-Group:          System Environment/Libraries
>+Group:          Development/Libraries
> License:        ASL 2.0
> URL:            http://code.google.com/p/json-simple/
>-Source0:        http://json-simple.googlecode.com/files/json_simple-1.1-all.zip
>-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
>-
>-%if %{with_gcj}
>-BuildRequires:    java-gcj-compat-devel >= 1.0.31
>-Requires(post):   java-gcj-compat >= 1.0.31
>-Requires(postun): java-gcj-compat >= 1.0.31
>-%else
>+# svn export http://json-simple.googlecode.com/svn/tags/tag_release_1_1_1/ json-simple-1.1.1
>+# tar czf json-simple-1.1.1-src-svn.tar.gz json-simple-1.1.1
>+Source0:        json-simple-1.1.1-src-svn.tar.gz
>+
> BuildArch:      noarch
>-%endif
> 
> BuildRequires:  jpackage-utils
> BuildRequires:  java-devel
>-BuildRequires:  ant
>+
>+BuildRequires:  maven
>+BuildRequires:  maven-compiler-plugin
>+BuildRequires:  maven-install-plugin
>+BuildRequires:  maven-javadoc-plugin
>+BuildRequires:  maven-plugin-bundle
>+BuildRequires:  maven-resources-plugin
>+BuildRequires:  maven-surefire-plugin
>+BuildRequires:  maven-surefire-provider-junit4
>+BuildRequires:  junit4
> 
> Requires:       jpackage-utils
> Requires:       java
>@@ -40,56 +43,53 @@ to encode or decode JSON text.
>   * No dependency on external libraries 
>   * Both of the source code and the binary are JDK1.2 compatible 
> 
>+%package javadoc
>+Group:         Documentation
>+Summary:       Javadoc for %{name}
>+Requires:      jpackage-utils
>+
>+%description javadoc
>+This package contains javadoc for %{name}.
>+
> %prep
>-%setup -q -n json_simple-%{version}-all
>+%setup -q -n json-simple-%{version}
> find . -name '*.jar' -exec rm -f '{}' \;
> # All the files have dos line endings, remove them.
> find . -type f -exec %{__sed} -i 's/\r//' {} \;
> 
> %build
>-%ant 
>-%install
>-rm -rf $RPM_BUILD_ROOT
> 
>-mkdir -p $RPM_BUILD_ROOT%{_javadir}
>-cp -p  lib/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
>-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
>+mvn-rpmbuild install javadoc:aggregate
> 
>-%if %{with_gcj}
>-%{_bindir}/aot-compile-rpm
>-%endif
>-
>-%post 
>-%if %{with_gcj}
>-  if [ -x %{_bindir}/rebuild-gcj-db ] 
>-  then
>-    %{_bindir}/rebuild-gcj-db
>-  fi
>-%endif
>+%install
> 
>-%postun
>-%if %{with_gcj}
>-  if [ -x %{_bindir}/rebuild-gcj-db ] 
>-  then
>-    %{_bindir}/rebuild-gcj-db
>-  fi
>-%endif
>+mkdir -p %{buildroot}%{_javadir}
>+install -pm 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
> 
>+mkdir -p %{buildroot}%{_mavenpomdir}
>+install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
>+%add_maven_depmap JPP-%{name}.pom %{name}.jar
> 
>-%clean
>-rm -rf $RPM_BUILD_ROOT
>+mkdir -p %{buildroot}%{_javadocdir}/%{name}
>+cp -rp target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
> 
> %files
>-%defattr(-,root,root,-)
>-%{_javadir}/*
>+%{_javadir}/%{name}.jar
>+%{_mavenpomdir}/JPP-%{name}.pom
>+%{_mavendepmapfragdir}/%{name}
>+%doc AUTHORS.txt ChangeLog.txt LICENSE.txt README.txt
> 
>-%if %{with_gcj}
>-%attr(-,root,root) %{_libdir}/gcj/%{name}
>-%endif
>-
>-%doc ChangeLog.txt LICENSE.txt test test.xml AUTHORS.txt README.txt
>+%files javadoc
>+%{_javadocdir}/%{name}
>+%doc LICENSE.txt
> 
> %changelog
>+* Fri Apr 20 2012 gil cattaneo <puntogil@libero.it> 1.1.1-1
>+- update to 1.1.1
>+- Removed gcj bits
>+- adapt to current guideline
>+- add sub package javadoc
>+
> * Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1-4
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
> 
>diff --git a/sources b/sources
>index 20addb4..e1fa64e 100644
>--- a/sources
>+++ b/sources
>@@ -1 +1 @@
>-bc5fabbac25d6b541d1b277f853f4a1e  json_simple-1.1-all.zip
>+e8cb2f4df5c420328666316f28ef76a6  json-simple-1.1.1-src-svn.tar.gz
>-- 
>1.7.7.6
>

Actions: View | Diff

Attachments on bug 818989: 582129 | 582141