SPECS: jtidy.spec - don't remove files we later actually need; rel 2

[glen]

Author: glen                         Date: Sun Nov 18 17:07:22 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- don't remove files we later actually need; rel 2

---- Files affected:
SPECS:
   jtidy.spec (1.7 -> 1.8) 

---- Diffs:

================================================================
Index: SPECS/jtidy.spec
diff -u SPECS/jtidy.spec:1.7 SPECS/jtidy.spec:1.8
--- SPECS/jtidy.spec:1.7	Wed Apr 18 00:28:19 2007
+++ SPECS/jtidy.spec	Sun Nov 18 18:07:17 2007
@@ -1,5 +1,5 @@
 # $Revision$, $Date$
-%define		_rel 1.1
+%define		_rel 2
 %include	/usr/lib/rpm/macros.java
 Summary:	HTML syntax checker and pretty printer
 Summary(pl.UTF-8):	Narzędzie do sprawdzania składni HTML i ładnego drukowania
@@ -65,11 +65,9 @@
 %setup -q -n %{name}-04aug2000r7-dev
 %patch0 -p0
 %patch1 -p1
+
 # remove all binary libs, javadocs, and included JAXP API sources
-find -name "*.jar" | xargs rm -rf
-rm -rf doc/api src/org/xml src/org/w3c/dom
-# correct silly permissions
-chmod -R go=u-w .
+find -name '*.jar' | xargs rm -v
 
 %build
 export CLASSPATH=$(build-classpath xml-commons-apis)
@@ -78,16 +76,10 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
 # jar
 install -d $RPM_BUILD_ROOT%{_javadir}
 cp -a build/Tidy.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-# jar versioning
-cd $RPM_BUILD_ROOT%{_javadir}
-for jar in *-%{version}.jar; do
-	ln -sf ${jar} `echo $jar| %{__sed} "s|-%{version}||g"`
-done
-cd -
+ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
 
 # javadoc
 install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
@@ -100,7 +92,7 @@
 
 # ant.d
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/ant.d
-cat > $RPM_BUILD_ROOT%{_sysconfdir}/ant.d/%{name} << EOF
+cat > $RPM_BUILD_ROOT%{_sysconfdir}/ant.d/%{name} << 'EOF'
 jtidy xml-commons-apis
 EOF
 
@@ -123,7 +115,7 @@
 
 %files scripts
 %defattr(644,root,root,755)
-#%attr(755,root,root) %{_bindir}/*
+%attr(755,root,root) %{_bindir}/*
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -131,8 +123,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.7  2007-04-17 22:28:19  glen
--  unify java package; does not build
+Revision 1.8  2007-11-18 17:07:17  glen
+- don't remove files we later actually need; rel 2
+
+Revision 1.7  2007/04/17 22:28:19  glen
+- unify java package; does not build
 
 Revision 1.6  2007/02/13 08:06:36  glen
 - tabs in preamble
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/jtidy.spec?r1=1.7&r2=1.8&f=u