- Cleanup with spec-cleaner and fix sle build properly

OBS-URL: https://build.opensuse.org/package/show/Java:packages/jzlib?expand=0&rev=17

jzlib.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Jul  8 09:27:35 UTC 2014 - tchvatal@suse.com
+
+- Cleanup with spec-cleaner and fix sle build properly
+
 -------------------------------------------------------------------
 Wed Apr 30 17:38:15 UTC 2014 - darin@darins.net
 

jzlib.spec

@@ -16,8 +16,6 @@
 #
 
 
-%define section   free
-
 Name:           jzlib
 Version:        1.1.2
 Release:        0
@@ -30,11 +28,11 @@ Url:            http://www.jcraft.com/jzlib/
 #Source0:        https://github.com/ymnk/jzlib/archive/1.1.2.tar.gz
 Source0:        1.1.2.tar.gz
 Source1:        %{name}_build.xml
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildArch:      noarch
 BuildRequires:  ant >= 1.6
 BuildRequires:  java-devel
 BuildRequires:  javapackages-tools
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildArch:      noarch
 
 %description
 The zlib is designed to be a free, general-purpose, legally
@@ -43,8 +41,6 @@ data-compression library for use on virtually any computer hardware and
 operating system. The zlib was written by Jean-loup Gailly
 (compression) and Mark Adler (decompression).
 
-
-
 %package        javadoc
 Summary:        Re-implementation of zlib in pure Java
 Group:          Development/Libraries/Java
@@ -52,7 +48,6 @@ Group:          Development/Libraries/Java
 %description    javadoc
 Javadoc for %{summary}.
 
-
 %package        demo
 Summary:        Re-implementation of zlib in pure Java
 Group:          Development/Libraries/Java
@@ -61,7 +56,7 @@ Group:          Development/Libraries/Java
 Demo files for %{summary}.
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q
 cp %{SOURCE1} build.xml
 #mkdir src
 #mv com src
@@ -71,13 +66,11 @@ cp %{SOURCE1} build.xml
 rm misc/mindtermsrc-v121-compression.patch
 
 %build
-ant dist javadoc 
+ant \
+    -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 \
+    dist javadoc
 
 %install
-%if 0%{?suse_version} == 1110
-export NO_BRP_CHECK_BYTECODE_VERSION=true
-%endif
-
 # jar
 install -Dpm 644 dist/lib/%{name}.jar \
   %{buildroot}%{_javadir}/%{name}.jar
@@ -89,8 +82,6 @@ cp -pr javadoc/* %{buildroot}%{_javadocdir}/%{name}
 # examples
 install -dm 755 %{buildroot}%{_datadir}/%{name}-%{version}
 cp -pr example/* %{buildroot}%{_datadir}/%{name}-%{version}
-# bnc#536215 - be compatible with older Packman package
-# ln -s %{name}-%{version} %{buildroot}%{_datadir}/%{name} # ghost symlink
 
 %files
 %defattr(0644,root,root,0755)