Update to upstream 1.1.0 release.

.gitignore

@@ -1 +1,2 @@
 jzlib-1.0.7.tar.gz
+jzlib-1.1.0.tar.gz

jzlib.spec

@@ -29,20 +29,20 @@
 #
 
 Name:           jzlib
-Version:        1.0.7
+Version:        1.1.0
-Release:        10%{?dist}
+Release:        1%{?dist}
 Epoch:          0
 Summary:        Re-implementation of zlib in pure Java
 
 Group:          Development/Libraries
 License:        BSD
 URL:            http://www.jcraft.com/jzlib/
-Source0:        http://www.jcraft.com/jzlib/jzlib-1.0.7.tar.gz
+Source0:        http://www.jcraft.com/jzlib/jzlib-%{version}.tar.gz
-Source1:        %{name}_build.xml
 
 BuildArch:      noarch
 BuildRequires:  jpackage-utils >= 0:1.6
-BuildRequires:  ant >= 0:1.6
+BuildRequires:  maven
+BuildRequires:  maven-resources-plugin
 Requires:       java
 Requires:       jpackage-utils
 
@@ -71,52 +71,40 @@ Requires:       %{name} = %{epoch}:%{version}-%{release}
 
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q
-cp %{SOURCE1} build.xml
+
-mkdir src
-mv com src
 
 %build
-ant dist javadoc 
+mvn-rpmbuild install javadoc:aggregate 
 
 %install
 # jars
-rm -rf $RPM_BUILD_ROOT
+install -Dpm 644 target/%{name}-%{version}.jar \
-install -Dpm 644 dist/lib/%{name}.jar \
+  $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
-  $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
 
 # javadoc
-install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -pr javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} 
 
 # examples
-install -dm 755 $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}
+install -dm 755 $RPM_BUILD_ROOT%{_datadir}/%{name}
-cp -pr example/* $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}
+cp -pr example/* $RPM_BUILD_ROOT%{_datadir}/%{name}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_datadir}/%{name} 
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root,-)
 %{_javadir}/*.jar
 %doc LICENSE.txt
 
 %files javadoc
-%defattr(-,root,root,-)
-%doc %{_javadocdir}/%{name}-%{version}
 %doc %{_javadocdir}/%{name}
 %doc LICENSE.txt
 
 %files demo
-%defattr(-,root,root,-)
-%doc %{_datadir}/%{name}-%{version}
 %doc %{_datadir}/%{name}
 
 %changelog
+* Fri Jan 13 2012 Alexander Kurtakov <akurtako@redhat.com> 0:1.1.0-1
+- Update to upstream 1.1.0 release.
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.0.7-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 

jzlib_build.xml

@@ -1,51 +0,0 @@
-<project name="Jzlib" default="dist" basedir=".">
-    <description>
-JZlib is a re-implementation of zlib in pure Java.
-The first and final aim for hacking this stuff is
-to add the packet compression support to pure Java SSH systems.
-    </description>
-  <!-- set global properties for this build -->
-  <property name="src" location="src"/>
-  <property name="build" location="build"/>
-  <property name="dist"  location="dist"/>
-  <property name="javadoc" location="javadoc"/>
-  <property name="javac.debug" value="false"/>
-  <path id="project.cp">
-    <pathelement location="${build}"/>
-  </path>
-  <target name="init">
-    <!-- Create the build directory structure used by compile -->
-    <mkdir dir="${build}"/>
-  </target>
-
-  <target name="compile" depends="init"
-        description="compile the source " >
-    <!-- Compile the java code from ${src} into ${build} -->
-    <javac srcdir="${src}" destdir="${build}" debug="${javac.debug}">
-    </javac>
-  </target>
-  <target name="dist" depends="compile"
-        description="generate the distribution" >
-    <!-- Create the distribution directory -->
-    <mkdir dir="${dist}/lib"/>
-
-    <!-- Put everything in ${build} into the jar file -->
-    <jar jarfile="${dist}/lib/jzlib.jar" basedir="${build}"/>
-  </target>
-
-  <target name="clean"
-        description="clean up" >
-    <!-- Delete the ${build} and ${dist} directory trees -->
-    <delete dir="${build}"/>
-    <delete dir="${dist}"/>
-    <delete dir="${javadoc}"/>
-  </target>
-
-  <target name="javadoc">
-  	<javadoc sourcepath="${src}"
-		destdir="${javadoc}"
-	>
-		<packageset dir="${src}"/>
-	</javadoc>
-  </target>
-</project>

sources

@@ -1 +1,2 @@
 3c52a0afb970e8a1fb2d34f30d330a83  jzlib-1.0.7.tar.gz
+4e7f30cc57f2053039897bebe8d615bb  jzlib-1.1.0.tar.gz