From ed5e88a0388185f111b8e9bab857b2c48b8860ca Mon Sep 17 00:00:00 2001
From: Alexander Kurtakov <akurtako@redhat.com>
Date: Wed, 26 Jan 2011 12:35:45 +0200
Subject: [PATCH] Update to upstream 1.4.1.

---
 .gitignore                                |  1 +
 modello-build-all-plugins.patch           | 22 ---------------
 modello-hibernateold-artifactid-fix.patch | 11 --------
 modello-jpp-depmap.xml                    | 13 ---------
 modello-use-old-pdcontainer.patch         | 33 -----------------------
 modello.spec                              | 27 +++++++------------
 sources                                   |  2 +-
 7 files changed, 11 insertions(+), 98 deletions(-)
 delete mode 100644 modello-build-all-plugins.patch
 delete mode 100644 modello-hibernateold-artifactid-fix.patch
 delete mode 100644 modello-use-old-pdcontainer.patch

diff --git a/.gitignore b/.gitignore
index b86ad14..47cfc2c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ modello-1.0-alpha-15-src.tar.gz
 modello-1.0.1-src.tar.gz
 modello-1.1-src.tar.gz
 modello-1.4-src.tar.xz
+modello-1.4.1-source-release.zip
diff --git a/modello-build-all-plugins.patch b/modello-build-all-plugins.patch
deleted file mode 100644
index b49f0a0..0000000
--- a/modello-build-all-plugins.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -up ./modello-plugins-sandbox/pom.xml.sav ./modello-plugins-sandbox/pom.xml
---- ./modello-plugins-sandbox/pom.xml.sav	2008-06-18 17:06:26.000000000 -0400
-+++ ./modello-plugins-sandbox/pom.xml	2008-06-18 17:06:37.000000000 -0400
-@@ -21,6 +21,7 @@
-   </dependencies>
-   <modules>
-     <module>modello-plugin-ojb</module>  
-+    <module>modello-plugin-prevayler</module>  
-     <!--
-     <module>modello-plugin-jdbc</module>
-     <module>modello-plugin-velocity</module>
-diff -up ./pom.xml.sav ./pom.xml
---- ./pom.xml.sav	2008-06-18 17:06:01.000000000 -0400
-+++ ./pom.xml	2008-06-18 17:06:18.000000000 -0400
-@@ -157,6 +157,7 @@
-     <module>modello-db-keywords</module>
-     <module>modello-test</module>
-     <module>modello-plugins</module>
-+    <module>modello-plugins-sandbox</module>
-   </modules>
-   <repositories>
-     <repository>
diff --git a/modello-hibernateold-artifactid-fix.patch b/modello-hibernateold-artifactid-fix.patch
deleted file mode 100644
index 6d1b313..0000000
--- a/modello-hibernateold-artifactid-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./modello-plugins-sandbox/modello-plugin-hibernate-old/pom.xml.sav	2006-06-13 16:02:05.000000000 -0400
-+++ ./modello-plugins-sandbox/modello-plugin-hibernate-old/pom.xml	2006-06-13 16:02:17.000000000 -0400
-@@ -5,7 +5,7 @@
-     <artifactId>modello-plugins-sandbox</artifactId>
-     <version>1.0-alpha-4-SNAPSHOT</version>
-   </parent>
--  <artifactId>modello-plugin-hibernate</artifactId>
-+  <artifactId>modello-plugin-hibernate-old</artifactId>
-   <version>1.0-alpha-4-SNAPSHOT</version>
-   <name>Modello Hibernate Plugin</name>
-   <dependencies>
diff --git a/modello-jpp-depmap.xml b/modello-jpp-depmap.xml
index 8dbb682..5a9a4c8 100644
--- a/modello-jpp-depmap.xml
+++ b/modello-jpp-depmap.xml
@@ -11,19 +11,6 @@
 	  <version>0.5.1</version>
 	</jpp>
   </dependency>
-  <dependency>
-	<maven>
-	  <groupId>wutka</groupId>
-	  <artifactId>dtdparser</artifactId>
-	  <version>1.21</version>
-	</maven>
-	<jpp>
-	  <groupId>JPP</groupId>
-	  <artifactId>dtdparser</artifactId>
-	  <version>1.21</version>
-	</jpp>
-  </dependency>
-
   <dependency>
       <maven>
           <groupId>org.codehaus.woodstox</groupId>
diff --git a/modello-use-old-pdcontainer.patch b/modello-use-old-pdcontainer.patch
deleted file mode 100644
index e2a88bf..0000000
--- a/modello-use-old-pdcontainer.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -up modello-core/src/main/java/org/codehaus/modello/Modello.java.sav modello-1.0-alpha-15/modello-core/src/main/java/org/codehaus/modello/Modello.java
---- modello-core/src/main/java/org/codehaus/modello/Modello.java.sav	2008-06-20 16:34:47.000000000 -0400
-+++ modello-core/src/main/java/org/codehaus/modello/Modello.java	2008-06-20 16:36:02.000000000 -0400
-@@ -30,8 +30,6 @@ import org.codehaus.modello.core.Modello
- import org.codehaus.modello.model.Model;
- import org.codehaus.modello.model.ModelValidationException;
- import org.codehaus.plexus.embed.Embedder;
--import org.codehaus.plexus.PlexusContainer;
--import org.codehaus.plexus.DefaultPlexusContainer;
- 
- /**
-  * @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
-@@ -40,7 +38,7 @@ import org.codehaus.plexus.DefaultPlexus
-  */
- public class Modello
- {
--    PlexusContainer container;
-+    Embedder embedder = new Embedder();
- 
-     ModelloCore core;
- 
-@@ -49,9 +47,9 @@ public class Modello
-     {
-         try
-         {
--            container = new DefaultPlexusContainer();
-+            embedder.start();
- 
--            core = (ModelloCore) container.lookup( ModelloCore.ROLE );
-+            core = (ModelloCore) embedder.lookup( ModelloCore.ROLE );
-         }
-         catch( Exception ex )
-         {
diff --git a/modello.spec b/modello.spec
index 75b3b7d..97cb534 100644
--- a/modello.spec
+++ b/modello.spec
@@ -27,26 +27,22 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-%define __jar_repack %{nil}
 
 Name:           modello
-Version:        1.4
-Release:        3%{?dist}
+Version:        1.4.1
+Release:        1%{?dist}
 Epoch:          0
 Summary:        Modello Data Model toolkit
 License:        MIT
 Group:          Development/Libraries
 URL:            http://modello.codehaus.org/
-# svn export https://svn.codehaus.org/modello/tags/modello-1.4
-# tar czf modello-1.4-src.tar.xz modello-1.4
-Source0:        %{name}-%{version}-src.tar.xz
+Source0:        http://repo2.maven.org/maven2/org/codehaus/%{name}/%{name}/%{version}/%{name}-%{version}-source-release.zip
 
 Source2:        %{name}-jpp-depmap.xml
 
 Patch0:         0001-Use-public-function-for-component-lookup.patch
 
 BuildArch:      noarch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  ant >= 0:1.6
 BuildRequires:  jpackage-utils >= 0:1.7.2
@@ -57,7 +53,7 @@ BuildRequires:  maven-install-plugin
 BuildRequires:  maven-jar-plugin
 BuildRequires:  maven-javadoc-plugin
 BuildRequires:  maven-resources-plugin
-BuildRequires:  maven-surefire-maven-plugin
+BuildRequires:  maven-surefire-plugin
 BuildRequires:  maven-site-plugin
 BuildRequires:  maven-surefire-provider-junit
 BuildRequires:  maven-dependency-plugin
@@ -123,7 +119,7 @@ API documentation for %{name}.
 # fix test compilation failure with new plexus-containers
 # not really needed now because we are skipping tests for other
 # problems...
-%patch0 -p1
+#%%patch0 -p1
 
 
 %build
@@ -140,8 +136,6 @@ mvn-jpp \
         install javadoc:aggregate
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 # poms and depmap fragments
 install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
 for i in `find . -name pom.xml -not -path ./pom.xml -not -path "*src/it/*"`; do
@@ -163,19 +157,14 @@ install -d -m 755 $RPM_BUILD_ROOT%{_bindir}
 
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
 for jar in $(find -type f -name "*-%{version}.jar" | grep -E target/.*.jar); do
-        install -m 644 $jar $RPM_BUILD_ROOT%{_javadir}/%{name}/`basename $jar |sed -e s:modello-::g`
+        install -m 644 $jar $RPM_BUILD_ROOT%{_javadir}/%{name}/`basename $jar |sed -e s:modello-::g|sed -e s:-%{version}::g`
 done
 
-(cd $RPM_BUILD_ROOT%{_javadir}/%{name} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
-
 # javadoc
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 (cd $RPM_BUILD_ROOT%{_javadocdir} && ln -sf %{name}-%{version} %{name})
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %post
 %update_maven_depmap
 
@@ -195,6 +184,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_javadocdir}/%{name}
 
 %changelog
+* Wed Jan 26 2011 Alexander Kurtakov <akurtako@redhat.com> 0:1.4.1-1
+- Update to upstream 1.4.1.
+
 * Wed Dec  1 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:1.4-3
 - Fix pom filenames (remove poms of integration tests) Resolves rhbz#655818
 - Use jpackage_script macro to generate script
@@ -267,4 +259,3 @@ rm -rf $RPM_BUILD_ROOT
 
 * Mon Nov 07 2005 Ralph Apel <r.apel at r-apel.de> - 0:1.0-0.a4.1jpp
 - First JPackage build
-
diff --git a/sources b/sources
index 1b704ea..860183a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8b06b96d892e34563efa8d7eb46d7607  modello-1.4-src.tar.xz
+18347f7285c7206736c0f0ddbfa3b81b  modello-1.4.1-source-release.zip