[apache-commons-beanutils] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
by Dennis Gilmore
commit a16a60f12eea5decd12391fd73bb6a90a1d484ee
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Mon Feb 7 19:23:26 2011 -0600
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
apache-commons-beanutils.spec | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/apache-commons-beanutils.spec b/apache-commons-beanutils.spec
index e985c7f..dc26901 100644
--- a/apache-commons-beanutils.spec
+++ b/apache-commons-beanutils.spec
@@ -4,7 +4,7 @@
Name: apache-%{short_name}
Version: 1.8.3
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Java utility methods for accessing and modifying the properties of arbitrary JavaBeans
License: ASL 2.0
Group: Development/Libraries
@@ -138,6 +138,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Mon Feb 07 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.8.3-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
* Thu Jul 8 2010 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 1.8.3-3
- Add license to javadoc subpackage
13 years, 2 months
[velocity] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
by Dennis Gilmore
commit 45df5f4a1c681b7d87aab2ef78ffa39a9f60ef34
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Mon Feb 7 19:17:15 2011 -0600
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
velocity.spec | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/velocity.spec b/velocity.spec
index a88ec98..1d761c5 100644
--- a/velocity.spec
+++ b/velocity.spec
@@ -30,7 +30,7 @@
Name: velocity
Version: 1.6.4
-Release: 2%{?dist}
+Release: 3%{?dist}
Epoch: 0
Summary: Java-based template engine
License: ASL 2.0
@@ -228,6 +228,9 @@ install -pD -T -m 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
%{_datadir}/%{name}
%changelog
+* Mon Feb 07 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0:1.6.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
* Fri Dec 17 2010 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0:1.6.4-2
- Add compatibility depmap
13 years, 2 months
[ant] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
by Dennis Gilmore
commit 04e20768e2b5d427c30636be8ef9f320a9c62777
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Mon Feb 7 19:15:22 2011 -0600
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
ant.spec | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/ant.spec b/ant.spec
index 7e1dd2e..0feb9c1 100644
--- a/ant.spec
+++ b/ant.spec
@@ -50,7 +50,7 @@
Name: ant
Version: 1.8.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Epoch: 0
Summary: Build tool for java
Summary(it): Tool per la compilazione di programmi java
@@ -803,6 +803,9 @@ rm -rf $RPM_BUILD_ROOT
# -----------------------------------------------------------------------------
%changelog
+* Mon Feb 07 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org>
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
* Mon Jan 3 2011 Alexander Kurtakov <akurtako(a)redhat.com> 0:1.8.2-1
- Update to new upstream version.
- Guidelines fixes.
13 years, 2 months
rpmlint: INFO; 0 errors, 6 warnings for maven-timestamp-plugin-1.0-5.fc15
by autoqa@fedoraproject.org
Stored logs available at <http://autoqa.fedoraproject.org/results/52383-autotest/qa02.c.fedoraproje...>
----------------------------------------------------------------------
========================================
maven-timestamp-plugin-1.0-5.fc15
========================================
maven-timestamp-plugin.noarch: W: spelling-error Summary(en_US) timestamps -> time stamps, time-stamps, times tamps
maven-timestamp-plugin.noarch: W: invalid-url URL: http://code.google.com/p/maven-timestamp-plugin HTTP Error 500: Internal Server Error
maven-timestamp-plugin.noarch: W: non-conffile-in-etc /etc/maven/fragments/maven-timestamp-plugin
maven-timestamp-plugin-javadoc.noarch: W: spelling-error Summary(en_US) Javadocs -> Java docs, Java-docs, Javanese
maven-timestamp-plugin.src: W: spelling-error Summary(en_US) timestamps -> time stamps, time-stamps, times tamps
maven-timestamp-plugin.src: W: invalid-url Source0: maven-timestamp-plugin-1.0.tar.xz
3 packages and 0 specfiles checked; 0 errors, 6 warnings.
13 years, 2 months
[maven-timestamp-plugin] * Sat Feb 05 2011 Guido Grazioli <guido.grazioli@gmail.com> - 1.0-5 - Build with maven 3 - Updated p
by Guido Grazioli
commit 21d91cc0e1ef6425b103b6d5983e47cfa781e494
Author: Guido Grazioli <guido.grazioli(a)gmail.com>
Date: Sat Feb 5 13:47:58 2011 +0100
* Sat Feb 05 2011 Guido Grazioli <guido.grazioli(a)gmail.com> - 1.0-5
- Build with maven 3
- Updated patch: use maven-release-plugin
- Updated patch: remove maven-source-plugin double declaration
001_build_without_timestamps.patch | 33 +++++++++++++++++++--------------
maven-timestamp-plugin.spec | 21 +++++++++++----------
2 files changed, 30 insertions(+), 24 deletions(-)
---
diff --git a/001_build_without_timestamps.patch b/001_build_without_timestamps.patch
index c5e0906..ca325a5 100644
--- a/001_build_without_timestamps.patch
+++ b/001_build_without_timestamps.patch
@@ -1,5 +1,5 @@
---- maven-timestamp-plugin/pom.xml.orig 2010-04-10 16:58:18.967050096 +0200
-+++ maven-timestamp-plugin/pom.xml 2010-04-10 17:06:16.259281566 +0200
+--- maven-timestamp-plugin/pom.xml.orig 2011-02-05 13:36:11.445630999 +0100
++++ maven-timestamp-plugin/pom.xml 2011-02-05 13:36:59.162630995 +0100
@@ -32,22 +32,6 @@
<build>
<plugins>
@@ -23,21 +23,26 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.2</version>
-@@ -75,13 +59,6 @@
+@@ -80,18 +64,6 @@
+ <tagBase>https://maven-timestamp-plugin.googlecode.com/svn/tags</tagBase>
+ </configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
-- <artifactId>maven-release-plugin</artifactId>
-- <configuration>
-- <tagBase>https://maven-timestamp-plugin.googlecode.com/svn/tags</tagBase>
-- </configuration>
-- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
-@@ -117,4 +94,4 @@
+- <artifactId>maven-source-plugin</artifactId>
+- <executions>
+- <execution>
+- <phase>package</phase>
+- <goals>
+- <goal>jar</goal>
+- </goals>
+- </execution>
+- </executions>
+- </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+@@ -117,4 +89,4 @@
<version>2.0.2</version>
</dependency>
</dependencies>
diff --git a/maven-timestamp-plugin.spec b/maven-timestamp-plugin.spec
index db1187a..2d98452 100644
--- a/maven-timestamp-plugin.spec
+++ b/maven-timestamp-plugin.spec
@@ -1,6 +1,6 @@
Name: maven-timestamp-plugin
Version: 1.0
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Provides formatted timestamps for maven builds
Group: Development/Libraries
@@ -12,19 +12,20 @@ URL: http://code.google.com/p/maven-timestamp-plugin
# tar cf maven-timestamp-plugin-1.0.tar maven-timestamp-plugin
# xz maven-timestamp-plugin-1.0.tar
Source0: maven-timestamp-plugin-1.0.tar.xz
-# this one removes previous timestamp plugin version from build
+# remove previous timestamp plugin version from build
Patch0: 001_build_without_timestamps.patch
BuildArch: noarch
BuildRequires: java-devel
BuildRequires: jpackage-utils
-BuildRequires: maven2
+BuildRequires: maven
BuildRequires: maven-jar-plugin
BuildRequires: maven-javadoc-plugin
BuildRequires: maven-source-plugin
BuildRequires: maven-compiler-plugin
BuildRequires: maven-install-plugin
BuildRequires: maven-plugin-plugin
+BuildRequires: maven-release-plugin
BuildRequires: maven-resources-plugin
BuildRequires: maven-site-plugin
BuildRequires: maven-surefire-plugin
@@ -65,12 +66,7 @@ EOT
%build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mkdir -p $MAVEN_REPO_LOCAL
-
-mvn-jpp \
- -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
- install javadoc:javadoc
+mvn-local install javadoc:javadoc
%install
@@ -88,7 +84,7 @@ cp -rp target/site/apidocs/ $RPM_BUILD_ROOT%{_javadocdir}/%{name}
# pom
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
install -pm 644 pom.xml \
-$RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
+ $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
%add_to_maven_depmap com.keyboardsamurais.maven %{name} %{version} JPP %{name}
@@ -111,6 +107,11 @@ $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
%update_maven_depmap
%changelog
+* Sat Feb 05 2011 Guido Grazioli <guido.grazioli(a)gmail.com> - 1.0-5
+- Build with maven 3
+- Updated patch: use maven-release-plugin
+- Updated patch: remove maven-source-plugin double declaration
+
* Mon Dec 13 2010 Alexander Kurtakov <akurtako(a)redhat.com> 1.0-4
- Adapt to current guidelines.
13 years, 2 months
[lucene] Fix depmap macro typo
by Stanislav Ochotnicky
commit ab478198faa0c36656276feb45269fea111d109a
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Wed Feb 2 16:01:58 2011 +0100
Fix depmap macro typo
lucene.spec | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/lucene.spec b/lucene.spec
index 582c2bc..5f8fc2b 100644
--- a/lucene.spec
+++ b/lucene.spec
@@ -164,7 +164,7 @@ done
for pom in contrib core demos parent; do
install -m 0644 lucene-$pom-pom.xml.template \
$RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-lucene-$pom.pom
- %add_to_maven_depmap org.apache.lucene lucene-$pom %{version} JPPlucene lucene-$pom
+ %add_to_maven_depmap org.apache.lucene lucene-$pom %{version} JPP lucene-$pom
done
# javadoc
13 years, 2 months
[lucene] Add maven metadata (rhbz#566775)
by Stanislav Ochotnicky
commit 0fde25125a34247da7acba3a376bf5a83d787880
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Wed Feb 2 15:50:46 2011 +0100
Add maven metadata (rhbz#566775)
lucene.spec | 31 ++++++++++++++++++++++++++++++-
1 files changed, 30 insertions(+), 1 deletions(-)
---
diff --git a/lucene.spec b/lucene.spec
index 3fe7e4c..582c2bc 100644
--- a/lucene.spec
+++ b/lucene.spec
@@ -31,7 +31,7 @@
Summary: High-performance, full-featured text search engine
Name: lucene
Version: 2.9.4
-Release: 1%{?dist}
+Release: 2%{?dist}
Epoch: 0
License: ASL 2.0
URL: http://lucene.apache.org/
@@ -132,12 +132,18 @@ unzip -o build/contrib/analyzers/common/lucene-analyzers-%{version}.jar META-INF
cat %{SOURCE2} >> META-INF/MANIFEST.MF
sed -i '/^\r$/d' META-INF/MANIFEST.MF
zip -u build/contrib/analyzers/lucene-analyzers-%{version}.jar META-INF/MANIFEST.MF
+cp contrib/analyzers/common/pom.xml.template contrib/analyzers/
+# prepare pom files (replace @version@ with real version)
+find contrib -iname '*.pom.xml.template' -exec \
+ sed -i "s:@version@:%{version}:g" \{\} \;
%install
# jars
install -d -m 0755 $RPM_BUILD_ROOT%{_javadir}
+install -d -m 0755 $RPM_BUILD_ROOT%{_mavenpomdir}
install -m 0644 build/%{name}-core-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+ln -sf %{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-core.jar
install -m 0644 build/%{name}-demos-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-demos.jar
# contrib jars
@@ -148,6 +154,17 @@ for c in analyzers ant benchmark collation fast-vector-highlighter highlighter \
xml-query-parser; do
install -m 0644 build/contrib/$c/%{name}-${c}-%{version}.jar \
$RPM_BUILD_ROOT%{_javadir}/%{name}-contrib/%{name}-${c}.jar
+
+ install -m 0644 contrib/$c/pom.xml.template \
+ $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.lucene-contrib-lucene-$c.pom
+ %add_to_maven_depmap org.apache.lucene lucene-$c %{version} JPP/lucene-contrib lucene-$c
+done
+
+# main poms
+for pom in contrib core demos parent; do
+ install -m 0644 lucene-$pom-pom.xml.template \
+ $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-lucene-$pom.pom
+ %add_to_maven_depmap org.apache.lucene lucene-$pom %{version} JPPlucene lucene-$pom
done
# javadoc
@@ -165,11 +182,20 @@ install -m 0644 build/%{name}web.war \
[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
+%post
+%update_maven_depmap
+
+%postun
+%update_maven_depmap
+
%files
%defattr(-,root,root,-)
%doc CHANGES.txt LICENSE.txt README.txt NOTICE.txt
+%{_mavenpomdir}/JPP*pom
+%{_mavendepmapfragdir}/%{name}
%{_javadir}/%{name}.jar
+%{_javadir}/%{name}-core.jar
%{_datadir}/%{name}-%{version}
%files javadoc
@@ -187,6 +213,9 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%{_javadir}/%{name}-demos.jar
%changelog
+* Wed Feb 2 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0:2.9.4-2
+- Add maven metadata (rhbz#566775)
+
* Mon Jan 31 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0:2.9.4-1
- Update to latest 2.x version (3.x is not API compatible)
- Add new modules
13 years, 2 months
[plexus-classworlds] Update to latest upstream version
by Stanislav Ochotnicky
commit 04db474a2943081f2db8d0a969ea0412412394a5
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Wed Feb 2 13:37:17 2011 +0100
Update to latest upstream version
- Drop ant build parts
- Versionless jars & javadocs
- Enable tests again
.gitignore | 7 +++-
plexus-classworlds-1.2-jpp-depmap.xml | 27 ------------
plexus-classworlds-settings.xml | 47 ---------------------
plexus-classworlds.depmap | 26 -----------
plexus-classworlds.spec | 74 +++++++++++----------------------
sources | 2 +-
6 files changed, 32 insertions(+), 151 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 031b81a..0437187 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,6 @@
-plexus-classworlds-2.2.3.tar.xz
+target/
+.project
+.classpath
+.settings/
+bin
+/plexus-classworlds-2.4.tar.gz
diff --git a/plexus-classworlds.spec b/plexus-classworlds.spec
index 0f2205a..9c6d8da 100644
--- a/plexus-classworlds.spec
+++ b/plexus-classworlds.spec
@@ -28,38 +28,26 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
-%global with_maven 1
%global parent plexus
%global subname classworlds
Name: %{parent}-%{subname}
-Version: 2.2.3
-Release: 2%{?dist}
+Version: 2.4
+Release: 1%{?dist}
Summary: Plexus Classworlds Classloader Framework
License: ASL 2.0 and Plexus
Group: Development/Libraries
URL: http://plexus.codehaus.org/
-# svn export http://svn.codehaus.org/plexus/plexus-classworlds/tags/plexus-classworlds... plexus-classworlds-2.2.3
-# tar caf plexus-classworlds-2.2.3.tar.xz plexus-classworlds-2.2.3
-Source0: %{name}-%{version}.tar.xz
+# git clone git://github.com/sonatype/plexus-classworlds.git
+# git archive --prefix="plexus-classworlds/" --format=tar plexus-classworlds-2.4 > plexus-classworlds-2.4.tar.gz
+Source0: %{name}-%{version}.tar.gz
-# Generated with mvn ant:ant
-Source1: plexus-classworlds-1.2-build.xml
-# Fedora-specific maven bits
-Source3: plexus-classworlds-settings.xml
-
-# workaround objectweb-asm depmap
-Source5: %{name}.depmap
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: jpackage-utils
-BuildRequires: ant
BuildRequires: apache-commons-logging
BuildRequires: xml-commons-jaxp-1.3-apis
-%if %{with_maven}
BuildRequires: maven2
BuildRequires: maven-compiler-plugin
BuildRequires: maven-install-plugin
@@ -74,7 +62,6 @@ BuildRequires: maven-shared-reporting-impl
BuildRequires: maven-dependency-plugin
BuildRequires: maven-surefire-maven-plugin
BuildRequires: maven-surefire-provider-junit
-%endif
BuildRequires: plexus-utils
Requires(post): jpackage-utils
@@ -99,59 +86,41 @@ Requires: jpackage-utils
API documentation for %{name}.
%prep
-%setup -q -n %{name}-%{version}
+%setup -q -n %{name}
for j in $(find . -name "*.jar" | grep -v /test-data/ | grep -v /test-jars/); do
- mv $j $j.no
+ rm $j
done
-cp %{SOURCE1} build.xml
-cp %{SOURCE3} settings.xml
-mkdir -p lib
-ln -sf $(build-classpath xml-commons-jaxp-1.3-apis) lib/xml-apis-1.3.02.jar
-ln -sf $(build-classpath ant) lib/ant-1.6.5.jar
-ln -sf $(build-classpath commons-logging) lib/commons-logging-1.0.3.jar
+# fix ant groupId
+sed -i 's:<groupId>ant</groupId>:<groupId>org.apache.ant</groupId>:' pom.xml
%build
export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
mkdir -p $MAVEN_REPO_LOCAL
-# tests skipped because of old commons-cli package these fail
-
-%if %{with_maven}
-mvn-jpp \
- -e \
- -Dmaven.test.skip=true \
+mvn-jpp -e \
-Dmaven.repo.local=$MAVEN_REPO_LOCAL \
- -Dmaven2.jpp.depmap.file=%{SOURCE5} \
install javadoc:javadoc
-%else
-export CLASSPATH=
-CLASSPATH=$CLASSPATH:target/classes:target/test-classes
-
-ant -Dbuild.sysclasspath=only jar javadoc
-%endif
%install
-rm -rf $RPM_BUILD_ROOT
# jars
install -Dpm 644 target/%{name}-%{version}.jar \
- $RPM_BUILD_ROOT%{_javadir}/plexus/%{subname}-%{version}.jar
+ $RPM_BUILD_ROOT%{_javadir}/plexus/%{subname}.jar
%add_to_maven_depmap org.codehaus.plexus %{name} %{version} JPP/%{parent} %{subname}
-(cd $RPM_BUILD_ROOT%{_javadir}/%{parent} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
-
# pom
install -Dpm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{parent}-%{subname}.pom
# 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 -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-%clean
-rm -rf $RPM_BUILD_ROOT
+%pre javadoc
+# workaround for rpm bug, can be removed in F-17
+[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
+rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%post
%update_maven_depmap
@@ -168,9 +137,16 @@ rm -rf $RPM_BUILD_ROOT
%files javadoc
%defattr(-,root,root,-)
-%doc %{_javadocdir}/*
+%doc LICENSE.txt
+%doc %{_javadocdir}/%{name}
%changelog
+* Wed Feb 2 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 2.4-1
+- Update to latest upstream version
+- Drop ant build parts
+- Versionless jars & javadocs
+- Enable tests again
+
* Tue Dec 21 2010 Alexander Kurtakov <akurtako(a)redhat.com> 2.2.3-2
- Fix FTBFS.
diff --git a/sources b/sources
index cba41ba..0bc77f0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4fe07489f26593b2ca1166cf101b3629 plexus-classworlds-2.2.3.tar.xz
+9bd9b4aa3bb05e627b1f1af8d1417884 plexus-classworlds-2.4.tar.gz
13 years, 2 months