rpms/json-lib/F-13 json-lib-2.3-pom.patch, NONE, 1.1 json-lib.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Lubomir Rintel
lkundrak at fedoraproject.org
Mon Jul 26 22:43:44 UTC 2010
- Previous message: rpms/json-lib/EL-6 json-lib-2.3-pom.patch, NONE, 1.1 json-lib.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message: rpms/json-lib/devel json-lib-2.3-pom.patch, NONE, 1.1 json-lib.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: lkundrak
Update of /cvs/pkgs/rpms/json-lib/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv9773/F-13
Modified Files:
.cvsignore sources
Added Files:
json-lib-2.3-pom.patch json-lib.spec
Log Message:
Initial import
json-lib-2.3-pom.patch:
pom.xml | 23 +++++++++++------------
1 file changed, 11 insertions(+), 12 deletions(-)
--- NEW FILE json-lib-2.3-pom.patch ---
>From 1e491f45f43516243168568d5248580b36dbacac Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak at v3.sk>
Date: Thu, 17 Jun 2010 16:17:37 +0200
Subject: [PATCH] Comment out useless stuff from pom
---
pom.xml | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/pom.xml b/pom.xml
index 06f2366..317c2d6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -233,18 +233,18 @@
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-all</artifactId>
+ <artifactId>groovy</artifactId>
<version>1.5.7</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
- <dependency>
+ <!--dependency>
<groupId>org.jruby</groupId>
<artifactId>jruby</artifactId>
<version>1.1</version>
<scope>compile</scope>
<optional>true</optional>
- </dependency>
+ </dependency-->
<dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
@@ -253,13 +253,13 @@
</dependency>
</dependencies>
- <prerequisites>
+ <!--prerequisites>
<maven>2.1.0</maven>
- </prerequisites>
+ </prerequisites-->
<build>
<defaultGoal>install</defaultGoal>
- <plugins>
+ <!--plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
@@ -305,10 +305,10 @@
</execution>
</executions>
</plugin>
- </plugins>
+ </plugins-->
</build>
- <reporting>
+ <!--reporting>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -364,7 +364,7 @@
<artifactId>javancss-maven-plugin</artifactId>
<version>2.0-beta-1</version>
</plugin>
- <!--
+ <!- -
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
@@ -380,9 +380,9 @@
<newTag>CURRENT</newTag>
</configuration>
</plugin>
- -->
+ - ->
</plugins>
- </reporting>
+ </reporting-->
<distributionManagement>
<repository>
--
1.7.0.1
--- NEW FILE json-lib.spec ---
Name: json-lib
Version: 2.3
Release: 3%{?dist}
Summary: JSON library for Java
Group: Development/Libraries
License: ASL 2.0
URL: http://json-lib.sourceforge.net/
# A plain jarball with the source is provided by upstream. We could use
# it, but we choose to build with maven for the sake of consistency.
# Therefore we pull the tree with maven metadata from VCS.
# cvs -d:pserver:anonymous at json-lib.cvs.sourceforge.net:/cvsroot/json-lib login
# cvs -z3 -d:pserver:anonymous at json-lib.cvs.sourceforge.net:/cvsroot/json-lib co -r REL_2_3 -d json-lib-2.3 -P json-lib
# tar czf json-lib-2.3.tar.gz --exclude CVS json-lib-2.3
Source0: %{name}-%{version}.tar.gz
Patch0: json-lib-2.3-pom.patch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: java-devel
BuildRequires: jpackage-utils
BuildRequires: antlr3-tool >= 3.2-7
BuildRequires: asm2
BuildRequires: ezmorph
BuildRequires: groovy >= 1.7.2-2
BuildRequires: jakarta-oro
BuildRequires: junit4
BuildRequires: log4j
BuildRequires: maven2-plugin-compiler
BuildRequires: maven2-plugin-install
BuildRequires: maven2-plugin-jar
BuildRequires: maven2-plugin-resources
BuildRequires: maven-surefire-maven-plugin
BuildRequires: maven-surefire-provider-junit
Requires: java
Requires: jpackage-utils
BuildArch: noarch
%description
JSON-lib is a java library for transforming beans, maps, collections, java
arrays and XML to JSON and back again to beans and DynaBeans.
%package javadoc
Group: Documentation
Summary: Javadoc for %{name}
Requires: %{name} = %{version}
%description javadoc
API documentation for %{name}.
%prep
%setup -q
%patch0 -p1 -b .pom
%build
# Not strictly needed, but it makes no harm to be on the safe side
find -name '*.jar' -o -name '*.class' -delete
MAVEN_REPO_LOCAL=$PWD/.m2/repository
mkdir -p $MAVEN_REPO_LOCAL
mvn-jpp -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
install javadoc:javadoc
%install
rm -rf $RPM_BUILD_ROOT
# Code
install -d $RPM_BUILD_ROOT%{_javadir}
install -m644 target/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}
ln -sf %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
# Documentation
install -d $RPM_BUILD_ROOT%{_javadocdir}
cp -ap target/site/apidocs $RPM_BUILD_ROOT%{_javadocdir}/%{name}
# Maven
install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}.pom
%add_to_maven_depmap net.sf.json-lib %{name} %{version} JPP %{name}
%clean
rm -rf $RPM_BUILD_ROOT
%post
%update_maven_depmap
%postun
%update_maven_depmap
%files
%defattr(-,root,root,-)
%{_javadir}/*
%{_mavendepmapfragdir}/*
%{_mavenpomdir}/*
%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/*
%changelog
* Fri Jul 23 2010 Lubomir Rintel <lkundrak at v3.sk> - 2.3-3
- Incorporate Review suggestions (Stanislav Ochotnicky)
- Drop prebuilt jars
- Tighten up the BRs
* Thu Jun 17 2010 Lubomir Rintel <lkundrak at v3.sk> - 2.3-2
- Carry the build over to Maven
- Package Maven poms & add depmap
- Add javadoc subpackage
* Thu May 20 2010 Lubomir Rintel <lkundrak at v3.sk> - 2.3-1
- Initial packaging
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/json-lib/F-13/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore 26 Jul 2010 22:37:36 -0000 1.1
+++ .cvsignore 26 Jul 2010 22:43:43 -0000 1.2
@@ -0,0 +1 @@
+json-lib-2.3.tar.gz
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/json-lib/F-13/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources 26 Jul 2010 22:37:38 -0000 1.1
+++ sources 26 Jul 2010 22:43:44 -0000 1.2
@@ -0,0 +1 @@
+f6cfe420286ab4a254ec976317c15b6d json-lib-2.3.tar.gz
- Previous message: rpms/json-lib/EL-6 json-lib-2.3-pom.patch, NONE, 1.1 json-lib.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message: rpms/json-lib/devel json-lib-2.3-pom.patch, NONE, 1.1 json-lib.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list