rpms/ini4j/devel ini4j-0.4.1-build.xml, NONE, 1.1 .cvsignore, 1.2, 1.3 import.log, 1.1, 1.2 ini4j.spec, 1.4, 1.5 sources, 1.2, 1.3 ini4j-0.3.2-pom.xml.patch, 1.1, NONE
Victor G. Vasilyev
victorv at fedoraproject.org
Tue Aug 11 12:59:58 UTC 2009
Author: victorv
Update of /cvs/pkgs/rpms/ini4j/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20186/devel
Modified Files:
.cvsignore import.log ini4j.spec sources
Added Files:
ini4j-0.4.1-build.xml
Removed Files:
ini4j-0.3.2-pom.xml.patch
Log Message:
Re-base to version 0.4.1. Ant is used instead of Maven to build software.
--- NEW FILE ini4j-0.4.1-build.xml ---
<?xml version="1.0" encoding="UTF-8"?>
<project basedir="." default="build" name="ini4j">
<description>
Build script for [ini4j] library.
</description>
<!-- config ============================================================== -->
<!-- general project attributes -->
<property name="artifactVersion" value="0.4.1"/>
<property name="build.app.name" value="ini4j-${artifactVersion}"/>
<!-- directory locations -->
<property name="build.dst" value="${basedir}/build"/>
<property name="build.src" value="${basedir}/src/"/>
<property name="build.dist" value="${basedir}/dist"/>
<property name="build.dst.classes" value="${build.dst}/classes"/>
<property name="build.dst.doc" value="${build.dst}/doc"/>
<!-- development tools -->
<property name="build.servlet.jar" value="/path/to/servlet.jar"/>
<property name="build.jetty.jar" value="/path/to/jetty.jar"/>
<!-- compiler options -->
<property name="build.compile.debug" value="true"/>
<property name="build.compile.deprecation" value="false"/>
<property name="build.compile.optimize" value="true"/>
<property name="build.compile.version" value="1.5"/>
<property name="build.compile.lint" value="-Xlint:unchecked"/>
<!-- clean =============================================================== -->
<target name="clean" description="Delete old build directory">
<delete dir="${build.dst}"/>
<delete dir="${build.dist}"/>
</target>
<!-- prepare ============================================================= -->
<target name="prepare" description="Prepare build">
<path id="build.classpath">
<pathelement location="${build.dst.classes}"/>
<pathelement path="${java.class.path}"/>
<pathelement location="${build.servlet.jar}"/>
<pathelement location="${build.jetty.jar}"/>
</path>
<mkdir dir="${build.dst}"/>
<mkdir dir="${build.dist}"/>
<mkdir dir="${build.dst.doc}"/>
</target>
<!-- compile ============================================================= -->
<target name="compile" depends="prepare" description="Compile Java sources">
<mkdir dir="${build.dst.classes}"/>
<javac
classpathref="build.classpath"
debug="${build.compile.debug}"
deprecation="${build.compile.deprecation}"
optimize="${build.compile.optimize}"
source="${build.compile.version}"
destdir="${build.dst.classes}">
<src path="${build.src}"/>
<compilerarg value="${build.compile.lint}"/>
</javac>
<!-- copy resources -->
<copy todir="${build.dst.classes}">
<fileset dir="${build.src}" excludes="**/*.java **/*.html **/*.xml **/*.ini"/>
</copy>
</target>
<!-- javadoc ============================================================= -->
<target name="javadoc" depends="compile" description="Create Javadoc">
<javadoc
source="${build.compile.version}"
linksource="yes"
access="protected"
locale="en_US"
encoding="ISO-8859-1"
docencoding="ISO-8859-1"
noqualifier="java.*:javax.*:org.ini4j.*"
destdir="${build.dst.doc}/api"
windowtitle="[ini4j] API documentation">
<fileset dir="${build.src}">
<include name="**/*.java"/>
</fileset>
<doctitle>[ini4j] API documentation</doctitle>
<header><b>[ini4j]</b></header>
<link href="http://java.sun.com/j2se/1.5.0/docs/api/"/>
<classpath refid="build.classpath"/>
</javadoc>
</target>
<!-- build =============================================================== -->
<target name="build" depends="compile" description="Build jar distribution files">
<jar destfile="${build.dist}/${build.app.name}.jar">
<fileset dir="${build.dst.classes}" excludes="**/*Test* **/*Sample* **/*Run* **/META-INF/**" />
</jar>
</target>
</project>
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ini4j/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore 3 Sep 2008 22:27:49 -0000 1.2
+++ .cvsignore 11 Aug 2009 12:59:57 -0000 1.3
@@ -1 +1 @@
-ini4j-0.3.2-src.zip
+ini4j-0.4.1-src.zip
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ini4j/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log 3 Sep 2008 22:27:49 -0000 1.1
+++ import.log 11 Aug 2009 12:59:57 -0000 1.2
@@ -1 +1,2 @@
ini4j-0_3_2-4_fc10:HEAD:ini4j-0.3.2-4.fc10.src.rpm:1220480845
+ini4j-0_4_1-1_fc12:HEAD:ini4j-0.4.1-1.fc12.src.rpm:1249995867
Index: ini4j.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ini4j/devel/ini4j.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- ini4j.spec 25 Jul 2009 03:22:32 -0000 1.4
+++ ini4j.spec 11 Aug 2009 12:59:58 -0000 1.5
@@ -1,6 +1,12 @@
+# Prevent brp-java-repack-jars from being run.
+%global __jar_repack %{nil}
+
+%global servlet_jar %{_javadir}/servlet.jar
+%global jetty_jar %{_javadir}/jetty/jetty.jar
+
Name: ini4j
-Version: 0.3.2
-Release: 7%{?dist}
+Version: 0.4.1
+Release: 1%{?dist}
Summary: Java API for handling files in Windows .ini format
Group: Development/Libraries
@@ -8,51 +14,21 @@ License: ASL 2.0
URL: http://www.ini4j.org/
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}-src.zip
Source1: http://www.apache.org/licenses/LICENSE-2.0.txt
-Patch0: %{name}-%{version}-pom.xml.patch
-
+Source2: %{name}-%{version}-build.xml
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
-# Recommended by http://fedoraproject.org/wiki/Packaging/Java
+# See http://ini4j.sourceforge.net/dependencies.html
BuildRequires: jpackage-utils
-BuildRequires: maven2-plugin-compiler
-BuildRequires: maven2-plugin-install
-BuildRequires: maven2-plugin-jar
-BuildRequires: maven2-plugin-javadoc
-BuildRequires: maven2-plugin-release
-BuildRequires: maven2-plugin-resources
-BuildRequires: maven2-plugin-surefire
-# Additionally defined in the pom.xml
-BuildRequires: maven2-plugin-assembly
-BuildRequires: maven2-plugin-antrun
-
-# See http://www.ini4j.org/dependencies.html
-# These dependencies are required to compile the application:
+BuildRequires: ant
BuildRequires: java-devel >= 1:1.6.0
-BuildRequires: maven2 >= 2.0.4
-BuildRequires: tomcat5 >= 5.5
BuildRequires: tomcat5-servlet-2.4-api >= 5.5
-# These dependencies are only required to compile unit tests for the application:
-# BuildRequires: jetty >= 4.2.2
-# BuildRequires: junit >= 3.8.2
-# BuildRequires: easymock >= 2.3
-# BuildRequires: easymockclassextension >= 2.3
-# BuildRequires: cglib-nodep >= 2.1_3
-# These dependencies are only required to run unit tests for the application:
-# Requires: jetty >= 4.2.2
-# Requires: junit >= 3.8.2
-# Requires: easymock >= 2.3
-# Requires: easymockclassextension >= 2.3
-# Requires: cglib-nodep >= 2.1_3
-# These dependencies should be provided by default when using the library:
-Requires: tomcat5-servlet-2.4-api >= 5.5
+BuildRequires: jetty >= 4.2.2
Requires: jpackage-utils
Requires: java >= 1:1.6.0
-
-Requires(post): jpackage-utils
-Requires(postun): jpackage-utils
+Requires: tomcat5-servlet-2.4-api >= 5.5
%description
The [ini4j] is a simple Java API for handling configuration files in Windows
@@ -73,56 +49,36 @@ This package contains the API documentat
%setup -q
cp -a %{SOURCE1} ./LICENSE-2.0.txt
+cp -a %{SOURCE2} ./build.xml
find . -type f \( -iname "*.jar" -o -iname "*.class" \) | xargs -t %{__rm} -f
-%patch0 -p1 -b .sav
-
# remove test sources
%{__rm} -rf src/test
# remove site sources
%{__rm} -rf src/site
-
%build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-%{__mkdir_p} $MAVEN_REPO_LOCAL
-
-mvn-jpp \
--Dmaven.repo.local=$MAVEN_REPO_LOCAL \
-install javadoc:javadoc
+%ant -Dbuild.servlet.jar=%{servlet_jar} -Dbuild.jetty.jar=%(jetty_jar) build javadoc
%install
%{__rm} -rf %{buildroot}
# JAR
%{__mkdir_p} %{buildroot}%{_javadir}
-%{__cp} -p target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
+%{__cp} -p dist/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
(cd %{buildroot}%{_javadir} && %{__ln_s} %{name}-%{version}.jar %{name}.jar)
# Javadoc
%{__mkdir_p} %{buildroot}%{_javadocdir}/%{name}
-%{__cp} -rp target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
-
-%{__install} -d -m 755 %{buildroot}%{_datadir}/maven2/poms
-%{__install} -pm 644 pom.xml %{buildroot}%{_datadir}/maven2/poms/JPP-%{name}.pom
-
-%add_to_maven_depmap org.apache.maven %{name} %{version} JPP %{name}
+%{__cp} -rp build/doc/api/* %{buildroot}%{_javadocdir}/%{name}
%clean
%{__rm} -rf %{buildroot}
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
%files
%defattr(-,root,root,-)
-%{_datadir}/maven2/poms
-%{_mavendepmapfragdir}
%{_javadir}/*
%doc LICENSE-2.0.txt src/main/java/org/ini4j/package.html
@@ -132,35 +88,6 @@ install javadoc:javadoc
%changelog
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.2-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Mon Mar 02 2009 Victor Vasilyev <victor.vasilyev at sun.com> 0.3.2-6
-- BR tomcat5, because tomcat-tomcat-parent.pom is required
-
-* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.2-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Wed Aug 27 2008 Victor Vasilyev <victor.vasilyev at sun.com> 0.3.2-4
-- Versionless symbolic link to the jar is added
-- Redundant user-defined macro for the poms directory is removed
-- Description is formatted
-- The LICENSE file added
-
-* Thu Aug 21 2008 Victor Vasilyev <victor.vasilyev at sun.com> 0.3.2-3
-- Ability to switch on the alternative implementations is removed
-- The %%{__install} macro is used everywhere instead of the install command
-- All macroses reflecting a folders layout of the project are removed
-- Explicit scriptlet dependencies for /bin/sh are removed
-- Owning of /etc/maven/fragments/ini4j is removed
-
-* Fri Aug 15 2008 Victor Vasilyev <victor.vasilyev at sun.com> 0.3.2-2
-- Documentation added
-- Appropriate values of Group Tags are chosen from the official list
-- The /etc/maven/fragments/ini4j file is attributed as a config(noreplace)
-
-* Fri Jun 06 2008 Victor Vasilyev <victor.vasilyev at sun.com> 0.3.2-1
-- Initial version.
- The spec provides target jar and javadoc, but
- it doesn't provide tests and site that are
- also defined in the original project.
+* Sat Aug 08 2009 Victor Vasilyev <victor.vasilyev at sun.com> 0.4.1-1
+- Re-base for the version 0.4.1
+- Ant instead of Maven
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ini4j/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources 3 Sep 2008 22:27:49 -0000 1.2
+++ sources 11 Aug 2009 12:59:58 -0000 1.3
@@ -1 +1 @@
-2c499f245b1668b51dd09e894f62b484 ini4j-0.3.2-src.zip
+73f7c4a5f010d5b968425b8415132eb1 ini4j-0.4.1-src.zip
--- ini4j-0.3.2-pom.xml.patch DELETED ---
More information about the fedora-extras-commits
mailing list