rpms/jakarta-commons-io/devel jakarta-commons-io.spec, 1.5, 1.6 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 jakarta-commons-io-settings.xml, 1.1, NONE jakarta-commons-io-jpp-depmap.xml, 1.1, NONE commons-parent-3.pom, 1.1, NONE
Alexander Kurtakov
akurtakov at fedoraproject.org
Fri Sep 18 13:28:40 UTC 2009
Author: akurtakov
Update of /cvs/pkgs/rpms/jakarta-commons-io/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19317/devel
Modified Files:
jakarta-commons-io.spec .cvsignore sources
Removed Files:
jakarta-commons-io-settings.xml
jakarta-commons-io-jpp-depmap.xml commons-parent-3.pom
Log Message:
Update to upstream 1.4.
Index: jakarta-commons-io.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-io/devel/jakarta-commons-io.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- jakarta-commons-io.spec 25 Jul 2009 03:50:27 -0000 1.5
+++ jakarta-commons-io.spec 18 Sep 2009 13:28:39 -0000 1.6
@@ -28,57 +28,42 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
-%define gcj_support 0
-
-
-# If you don't want to build with maven, and use straight ant instead,
-# give rpmbuild option '--without maven'
-
-%define with_maven 0
-
%define base_name commons-io
Name: jakarta-commons-io
-Version: 1.3.2
-Release: 3.2%{?dist}
+Version: 1.4
+Release: 1%{?dist}
Epoch: 0
Summary: Utilities to assist with developing IO functionality
-Group: Development/Libraries/Java
+Group: Development/Libraries
License: ASL 2.0
-URL: http://jakarta.apache.org/commons/io/
-Source0: http://archive.apache.org/dist/commons/io/source/commons-io-1.3.2-src.tar.gz
-Source1: %{name}-settings.xml
-Source2: %{name}-jpp-depmap.xml
-Source3: commons-parent-3.pom
+URL: http://commons.apache.org/io/
+Source0: http://archive.apache.org/dist/commons/io/source/commons-io-%{version}-src.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-%if ! %{gcj_support}
BuildArch: noarch
-%endif
BuildRequires: jpackage-utils >= 0:1.7.2
BuildRequires: ant >= 0:1.6
BuildRequires: ant-junit >= 0:1.6
BuildRequires: junit >= 0:3.8.1
-%if %{with_maven}
BuildRequires: maven2 >= 2.0.4-10jpp
+BuildRequires: maven2-plugin-assembly
+BuildRequires: maven2-plugin-antrun
+BuildRequires: maven-plugin-bundle
BuildRequires: maven2-plugin-compiler
+BuildRequires: maven2-plugin-idea
BuildRequires: maven2-plugin-install
BuildRequires: maven2-plugin-jar
BuildRequires: maven2-plugin-javadoc
BuildRequires: maven2-plugin-resources
-BuildRequires: maven2-plugin-surefire
-%endif
+BuildRequires: maven-surefire-maven-plugin
+BuildRequires: maven-surefire-provider-junit
+BuildRequires: maven-doxia-sitetools
Requires: jpackage-utils
Requires(post): jpackage-utils >= 0:1.7.2
Requires(postun): jpackage-utils >= 0:1.7.2
-%if %{gcj_support}
-BuildRequires: java-gcj-compat-devel
-Requires(post): java-gcj-compat
-Requires(postun): java-gcj-compat
-%endif
-
%description
Commons-IO contains utility classes, stream implementations,
file filters, and endian classes. It is a library of utilities
@@ -87,58 +72,31 @@ to assist with developing IO functionali
%package javadoc
Summary: Javadoc for %{name}
Group: Documentation
-Requires: jpackage-utils
-Requires(postun): jpackage-utils
%description javadoc
Javadoc for %{name}
%prep
%setup -q -n %{base_name}-%{version}-src
-cp %{SOURCE1} settings.xml
-mkdir -p .m2/repository/JPP/maven2/default_poms
-cp %{SOURCE3} .m2/repository/JPP/maven2/default_poms/org.apache.commons-commons-parent.pom
%build
-%if %{with_maven}
-sed -i -e "s|<url>__JPP_URL_PLACEHOLDER__</url>|<url>file://`pwd`/.m2/repository</url>|g" settings.xml
-sed -i -e "s|<url>__JAVADIR_PLACEHOLDER__</url>|<url>file://`pwd`/external_repo</url>|g" settings.xml
-sed -i -e "s|<url>__MAVENREPO_DIR_PLACEHOLDER__</url>|<url>file://`pwd`/.m2/repository</url>|g" settings.xml
-sed -i -e "s|<url>__MAVENDIR_PLUGIN_PLACEHOLDER__</url>|<url>file:///usr/share/maven2/plugins</url>|g" settings.xml
-sed -i -e "s|<url>__ECLIPSEDIR_PLUGIN_PLACEHOLDER__</url>|<url>file:///usr/share/eclipse/plugins</url>|g" settings.xml
-
export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
mkdir -p $MAVEN_REPO_LOCAL
-mkdir external_repo
-ln -s %{_javadir} external_repo/JPP
-
mvn-jpp \
-e \
-s $(pwd)/settings.xml \
-Dmaven2.jpp.mode=true \
- -Dmaven2.jpp.depmap.file=%{SOURCE2} \
-Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+ -Dmaven.test.skip=true \
install javadoc:javadoc
-%else
-
-export OPT_JAR_LIST="ant/ant-junit junit"
-export CLASSPATH=
-CLASSPATH=target/classes:target/test-classes:$CLASSPATH
-ant -Dbuild.sysclasspath=only dist
-%endif
%install
rm -rf $RPM_BUILD_ROOT
# jars
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-%if %{with_maven}
install -pm 644 target/%{base_name}-%{version}.jar \
$RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-%else
-install -Dpm 644 build/%{base_name}-%{version}.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-%endif
ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
ln -s %{name}-%{version}.jar \
$RPM_BUILD_ROOT%{_javadir}/%{base_name}-%{version}.jar
@@ -153,41 +111,17 @@ install -pm 644 pom.xml \
$RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}.pom
install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-%if %{with_maven}
cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-%else
-unzip -q build/dist/%{base_name}-%{version}.zip %{base_name}-%{version}/docs/* \
- -d $RPM_BUILD_ROOT%{_javadocdir}
-mv $RPM_BUILD_ROOT%{_javadocdir}/%{base_name}-%{version}/docs/* \
- $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-rm -r $RPM_BUILD_ROOT%{_javadocdir}/%{base_name}-%{version}
-%endif
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-%if %{gcj_support}
-%{_bindir}/aot-compile-rpm
-%endif
-
%clean
rm -rf $RPM_BUILD_ROOT
%post
%update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
- %{_bindir}/rebuild-gcj-db
-fi
-%endif
%postun
%update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
- %{_bindir}/rebuild-gcj-db
-fi
-%endif
%files
%defattr(-,root,root,-)
@@ -195,10 +129,6 @@ fi
%{_javadir}/*.jar
%{_datadir}/maven2/poms/*
%{_mavendepmapfragdir}
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-%{version}.jar.*
-%endif
%files javadoc
%defattr(-,root,root,-)
@@ -206,6 +136,9 @@ fi
%doc %{_javadocdir}/%{name}
%changelog
+* Fri Sep 18 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.4-1
+- Update to upstream 1.4.
+
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.3.2-3.2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-io/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore 22 Jan 2008 19:01:26 -0000 1.3
+++ .cvsignore 18 Sep 2009 13:28:39 -0000 1.4
@@ -1 +1,2 @@
commons-io-1.3.2-src.tar.gz
+commons-io-1.4-src.tar.gz
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-io/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources 22 Jan 2008 19:01:26 -0000 1.3
+++ sources 18 Sep 2009 13:28:40 -0000 1.4
@@ -1 +1 @@
-7c98f852e70d52d4d9c3d8057be518f8 commons-io-1.3.2-src.tar.gz
+24b228f2d0c40ffed9204cdab015bccf commons-io-1.4-src.tar.gz
--- jakarta-commons-io-settings.xml DELETED ---
--- jakarta-commons-io-jpp-depmap.xml DELETED ---
--- commons-parent-3.pom DELETED ---
More information about the fedora-extras-commits
mailing list