rpms/jempbox/devel .cvsignore, 1.2, 1.3 jempbox.spec, 1.1, 1.2 sources, 1.2, 1.3

[Orion Poplawski]

Author: orion

Update of /cvs/pkgs/rpms/jempbox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31761

Modified Files:
	.cvsignore jempbox.spec sources 
Log Message:
* Fri Jan 8 2010 Orion Poplawski <orion at cora.nwra.com> - 1.0.0-1
- Update to 1.0.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jempbox/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	18 Oct 2009 01:51:31 -0000	1.2
+++ .cvsignore	8 Jan 2010 21:00:21 -0000	1.3
@@ -1 +1 @@
-jempbox-0.8.0-incubating-src.jar
+jempbox-1.0.0-src.jar


Index: jempbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jempbox/devel/jempbox.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- jempbox.spec	18 Oct 2009 01:51:32 -0000	1.1
+++ jempbox.spec	8 Jan 2010 21:00:21 -0000	1.2
@@ -1,21 +1,28 @@
 %global with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
 
 Name:           jempbox
-Version:        0.8.0
-Release:        6%{?dist}
+Version:        1.0.0
+Release:        1%{?dist}
 Summary:        Java library for working with XMP metadata
 
 Group:          Development/Libraries
 License:        ASL 2.0
-URL:            http://incubator.apache.org/pdfbox/
-Source0:        http://www.apache.org/dist/incubator/pdfbox/%{name}/source/%{name}-%{version}-incubating-src.jar
-#Disable downloading of required jars
-Patch0:         %{name}-0.8.0-local.patch
+URL:            http://pdfbox.apache.org/
+Source0:        http://www.apache.org/dist/pdfbox/%{name}/source/%{name}-%{version}-src.jar
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  jpackage-utils
 BuildRequires:  java-devel
-BuildRequires:  ant-junit
+BuildRequires:  maven2
+BuildRequires:  maven-plugin-bundle
+BuildRequires:  maven2-plugin-compiler
+BuildRequires:  maven2-plugin-install
+BuildRequires:  maven2-plugin-jar
+BuildRequires:  maven2-plugin-javadoc
+BuildRequires:  maven2-plugin-resources
+BuildRequires:  maven2-plugin-surefire
+BuildRequires:  maven-doxia-sitetools
+BuildRequires:  maven-surefire-provider-junit
 
 %if %{with_gcj}
 BuildRequires:    java-gcj-compat-devel >= 1.0.31
@@ -43,8 +50,7 @@ This package contains the API documentat
 
 
 %prep
-%setup -q -n %{name}-%{version}-incubating
-%patch0 -p1 -b .local
+%setup -q
 find -name '*.class' -exec rm -f '{}' \;
 find -name '*.jar' -exec rm -f '{}' \;
 #Fix line endings
@@ -52,31 +58,40 @@ find -name '*.txt' -exec sed -i 's/\r//'
 
 
 %build
-ant package javadoc
+export 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
 mkdir -p $RPM_BUILD_ROOT%{_javadir}
-cp -p target/%{name}-%{version}-incubating.jar \
+cp -p target/%{name}-%{version}.jar \
   $RPM_BUILD_ROOT%{_javadir}/
-ln -s %{name}-%{version}-incubating.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-ln -s %{name}-%{version}-incubating.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
 
 mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -rp website/build/site/javadoc \
-$RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -rp target/site/apidocs $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/maven2/poms
+cp -p pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
 
 %if %{with_gcj}
 %{_bindir}/aot-compile-rpm
 %endif
 
+%add_to_maven_depmap org.apache.maven %{name} %{version} JPP %{name}
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
 %post
+%update_maven_depmap
 %if %{with_gcj}
   if [ -x %{_bindir}/rebuild-gcj-db ] 
   then
@@ -85,6 +100,7 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %postun
+%update_maven_depmap
 %if %{with_gcj}
   if [ -x %{_bindir}/rebuild-gcj-db ] 
   then
@@ -96,9 +112,10 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc LICENSE.txt NOTICE.txt README.txt RELEASE-NOTES.txt
+%{_datadir}/maven2/poms
+%{_mavendepmapfragdir}
 %{_javadir}/%{name}.jar
 %{_javadir}/%{name}-%{version}.jar
-%{_javadir}/%{name}-%{version}-incubating.jar
 %if %{with_gcj}
 %attr(-,root,root) %{_libdir}/gcj/%{name}
 %endif
@@ -109,6 +126,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Jan 8 2010 Orion Poplawski <orion at cora.nwra.com> - 1.0.0-1
+- Update to 1.0.0
+
 * Thu Oct 15 2009 Orion Poplawski <orion at cora.nwra.com> - 0.8.0-6
 - Add javadoc subpackage
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jempbox/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	18 Oct 2009 01:51:32 -0000	1.2
+++ sources	8 Jan 2010 21:00:21 -0000	1.3
@@ -1 +1 @@
-b15d0837cc25b47bbdb0e2a49b8c6b65  jempbox-0.8.0-incubating-src.jar
+87485277594602873035cf637a82e140  jempbox-1.0.0-src.jar