From 66cd3161ab871a0bc1af66cc3c99547e265576bf Mon Sep 17 00:00:00 2001 From: Stanislav Ochotnicky Date: May 31 2010 07:20:49 +0000 Subject: Initial import of apache-commons-configuration --- diff --git a/.cvsignore b/.cvsignore index e69de29..861b427 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +commons-configuration-1.6-src.tar.gz diff --git a/apache-commons-configuration.spec b/apache-commons-configuration.spec new file mode 100644 index 0000000..316c034 --- /dev/null +++ b/apache-commons-configuration.spec @@ -0,0 +1,216 @@ + +%global base_name configuration +%global short_name commons-%{base_name} + +Name: apache-%{short_name} +Version: 1.6 +Release: 1%{?dist} +Summary: Commons Configuration Package + +Group: Development/Libraries +License: ASL 2.0 +URL: http://commons.apache.org/%{base_name}/ +Source0: http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz +Patch0: %{short_name}-test-deps.patch +BuildArch: noarch + +BuildRequires: java-devel +BuildRequires: jpackage-utils >= 0:1.7.2 +BuildRequires: maven-doxia-sitetools +BuildRequires: maven-plugin-bundle +BuildRequires: maven-surefire-maven-plugin +BuildRequires: maven-surefire-provider-junit +BuildRequires: maven2-plugin-antrun +BuildRequires: maven2-plugin-assembly +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: xalan-j2 +BuildRequires: xerces-j2 +BuildRequires: xml-commons-apis +BuildRequires: apache-commons-beanutils >= 0:1.7.0 +BuildRequires: apache-commons-codec +BuildRequires: apache-commons-lang +BuildRequires: apache-commons-logging +# convert to apache-commons when transition is done +BuildRequires: jakarta-commons-collections +BuildRequires: jakarta-commons-dbcp +BuildRequires: jakarta-commons-digester +BuildRequires: jakarta-commons-jxpath +BuildRequires: jakarta-commons-pool +# update to tomcat5 servlet APIs when maven is updated +BuildRequires: servletapi5 +BuildRequires: tomcat5 +Requires: servletapi5 + +Requires: apache-commons-beanutils >= 0:1.7.0 +Requires: apache-commons-codec +Requires: apache-commons-jxpath +Requires: apache-commons-lang +Requires: apache-commons-logging +Requires: jakarta-commons-collections +Requires: jakarta-commons-dbcp +Requires: jakarta-commons-digester +Requires: jakarta-commons-pool +Requires: xerces-j2 +Requires: xml-commons-apis + +Requires(post): jpackage-utils >= 1.7.2 +Requires(postun): jpackage-utils >= 1.7.2 + +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Provides: jakarta-%{short_name} = 0:%{version}-%{release} +Obsoletes: jakarta-%{short_name} < 0:%{version}-%{release} + +%description +Configuration is a project to provide a generic Configuration +interface and allow the source of the values to vary. It +provides easy typed access to single, as well as lists of +configuration values based on a 'key'. +Right now you can load properties from a simple properties +file, a properties file in a jar, an XML file, JNDI settings, +as well as use a mix of different sources using a +ConfigurationFactory and CompositeConfiguration. +Custom configuration objects are very easy to create now +by just subclassing AbstractConfiguration. This works +similar to how AbstractList works. + +%package javadoc +Summary: API documentation for %{name} +Group: Documentation +Requires: jpackage-utils + +Provides: jakarta-%{short_name}-javadoc = 0:%{version}-%{release} +Obsoletes: jakarta-%{short_name}-javadoc < 0:%{version}-%{release} + +%description javadoc +%{summary}. + + +%prep +%setup -q -n %{short_name}-%{version}-src +%patch0 -p1 +%{__sed} -i 's/\r//' LICENSE.txt + +%build +export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository +mkdir -p $MAVEN_REPO_LOCAL + +mvn-jpp -Dmaven.repo.local=$MAVEN_REPO_LOCAL \ + -Dmaven.test.skip=true \ + install javadoc:javadoc + +%install +rm -rf $RPM_BUILD_ROOT +# jars +install -d -m 755 $RPM_BUILD_ROOT%{_javadir} +install -p -m 644 target/%{short_name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar + +pushd $RPM_BUILD_ROOT%{_javadir} +for jar in *-%{version}*; do + ln -sf ${jar} `echo $jar| sed "s|apache-||g"` + ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"` + ln -sf ${jar} `echo $jar| sed "s|apache-\(.*\)-%{version}|\1|g"` +done +popd # come back from javadir + +# javadoc +install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} +cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} +ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} + +# Install pom +install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir} +install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{short_name}.pom +%add_to_maven_depmap org.apache.commons %{short_name} %{version} JPP %{short_name} + +# following line is only for backwards compatibility. New packages +# should use proper groupid org.apache.commons and also artifactid +%add_to_maven_depmap %{short_name} %{short_name} %{version} JPP %{short_name} + +%clean +rm -rf $RPM_BUILD_ROOT + +%post +%update_maven_depmap + +%postun +%update_maven_depmap + +%files +%defattr(-,root,root,-) +%{_mavendepmapfragdir}/* +%{_mavenpomdir}/JPP-%{short_name}.pom +%doc LICENSE.txt +%{_javadir}/*.jar + +%files javadoc +%defattr(-,root,root,-) +%doc %{_javadocdir}/%{name}-%{version} +%doc %{_javadocdir}/%{name} + + +%changelog +* Thu May 27 2010 Stanislav Ochotnicky - 1.6-1 +- Rename package (jakarta-commons-configuration->apache-commons-configuration) +- Build with maven instead of ant, drop deprecated patches +- Rebase, cleanups, drop epoch + +* Thu Aug 20 2009 Alexander Kurtakov 0:1.4-7 +- Fix description. +- Remove requires(post/postun) for javadoc subpackage. +- Use sed instead of dos2unix. + +* Thu Aug 20 2009 Alexander Kurtakov 0:1.4-6 +- Remove gcj support. +- Initial build for Fedora. + +* Mon May 18 2009 Fernando Nasser - 0:1.4-5 +- Fix license +- Fix source URL + +* Wed Mar 18 2009 Yong Yang - 0:1.4-4 +- rebuild with new maven2 2.0.8 built in bootstrap mode + +* Thu Feb 05 2009 Yong Yang - 0:1.4-3 +- Fix release tag + +* Wed Jan 14 2009 Yong Yang - 0:1.4-2jpp +- Import from dbhole's maven 2.0.8 packages, initial building + +* Mon Aug 13 2007 Ralph Apel - 0:1.4-1jpp +- Upgrade to 1.4 +- Add pom file + +* Thu May 03 2007 Ralph Apel - 0:1.2-3jpp +- Patch one test + +* Wed Mar 07 2007 Ralph Apel - 0:1.2-2jpp +- Add gcj_support option +- Optionally build without maven + +* Mon Feb 20 2006 Ralph Apel - 0:1.2-1jpp +- Upgrade to 1.2 + +* Mon Feb 20 2006 Ralph Apel - 0:1.1-2jpp +- Rebuild for JPP-1.7 and maven-1.1 + +* Thu Sep 15 2005 Ralph Apel - 0:1.1-1jpp +- Upgrade to 1.1 +- Omit findbugs and tasks reports: don't have these plugins yet +- Requires java 1.4.2 to build + +* Mon Feb 21 2005 Ralph Apel - 0:1.0.f-1jpp +- Upgrade to 1.0 final, letter in version can be bumped with 1.1 +- Prepare for build with maven, but still build with ant + +* Sun Aug 23 2004 Randy Watler - 0:1.0.d3-2jpp +- Rebuild with ant-1.6.2 +- Upgrade to Ant 1.6.X +* Mon Jan 19 2004 Ralph Apel - 0:1.0.d3-1jpp +- First JPackage release diff --git a/commons-configuration-test-deps.patch b/commons-configuration-test-deps.patch new file mode 100644 index 0000000..5a14bec --- /dev/null +++ b/commons-configuration-test-deps.patch @@ -0,0 +1,52 @@ +diff --git a/pom.xml b/pom.xml +index 14aa243..50396e2 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -327,13 +327,6 @@ + + + +- dbunit +- dbunit +- 2.1 +- test +- +- +- + junit + junit + 3.8.1 +@@ -341,33 +334,6 @@ + + + +- junit-addons +- junit-addons +- 1.4 +- test +- +- +- xerces +- xmlParserAPIs +- +- +- +- +- +- mockobjects +- mockobjects-core +- 0.09 +- test +- +- +- +- mockobjects +- mockobjects-jdk1.4-j2ee1.3 +- 0.09 +- test +- +- +- + javax.mail + mail + 1.4 diff --git a/import.log b/import.log new file mode 100644 index 0000000..a83602a --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +apache-commons-configuration-1_6-1_fc14:HEAD:apache-commons-configuration-1.6-1.fc14.src.rpm:1275290415 diff --git a/sources b/sources index e69de29..cb0bad3 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +1caad868ead4e13fe3911494182a1e40 commons-configuration-1.6-src.tar.gz