rpms/jlex/devel jlex.spec,1.20,1.21

[Andrew Overholt]

Author: overholt

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

Modified Files:
	jlex.spec 
Log Message:
* Mon Jan 11 2010 Andrew Overholt <overholt at redhat.com> 0:1.2.6-9.4
- Fix Group tags
- Remove ghost symlinking in %post{,un}
- Add cleaning of buildroot in %install
- Remove dot in javadoc Summary
- Fix URL for Source0
- Fix mixed tabs and spaces


Index: jlex.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jlex/devel/jlex.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- jlex.spec	10 Aug 2009 09:11:40 -0000	1.20
+++ jlex.spec	11 Jan 2010 17:46:40 -0000	1.21
@@ -32,16 +32,16 @@
 
 %define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
 
-%define section		free
+%define section free
 
 Name:           jlex
 Version:        1.2.6
-Release:        9.3%{?dist}
-Epoch:		0
+Release:        9.4%{?dist}
+Epoch:          0
 Summary:        A Lexical Analyzer Generator for Java
 License:        BSD
-Group:          Development/Libraries/Java
-Source0:        http://www.cs.princeton.edu/~appel/modern/java/JLex/Archive/1.2.5/Main.java
+Group:          Development/Libraries
+Source0:        http://www.cs.princeton.edu/~appel/modern/java/JLex/Archive/%{version}/Main.java
 Source1:        %{name}-%{version}.build.xml
 Patch0:         %{name}-%{version}.static.patch
 URL:            http://www.cs.princeton.edu/~appel/modern/java/JLex/
@@ -52,20 +52,17 @@ BuildArch:      noarch
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
 %if %{gcj_support}
-BuildRequires:		java-gcj-compat-devel
-Requires(post):		java-gcj-compat
-Requires(postun):	java-gcj-compat
+BuildRequires:    java-gcj-compat-devel
+Requires(post):   java-gcj-compat
+Requires(postun): java-gcj-compat
 %endif
 
 %description
 JLex is a Lexical Analyzer Generator for Java
 
 %package javadoc
-Group:          Development/Java
-Summary:        Javadoc for %{name}.
-# for /bin/rm and /bin/ln
-Requires(post):		coreutils
-Requires(postun):	coreutils
+Group:          Documentation
+Summary:        Javadoc for %{name}
 
 %description javadoc
 Javadoc for %{name}.
@@ -81,6 +78,7 @@ unset CLASSPATH
 ant
 
 %install
+rm -rf $RPM_BUILD_ROOT
 # jar
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
 install -m 644 dist/lib/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
@@ -97,15 +95,6 @@ ln -s %{name}-%{version} $RPM_BUILD_ROOT
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post javadoc
-rm -f %{_javadocdir}/%{name}
-ln -s %{name}-%{version} %{_javadocdir}/%{name}
-
-%postun javadoc
-if [ "$1" = "0" ]; then
-    rm -f %{_javadocdir}/%{name}
-fi
-
 %post
 %if %{gcj_support}
 if [ -x %{_bindir}/rebuild-gcj-db ]
@@ -133,9 +122,17 @@ fi
 %files javadoc
 %defattr(-,root,root,-)
 %doc %{_javadocdir}/%{name}-%{version}
-%ghost %doc %{_javadocdir}/%{name}
+%doc %{_javadocdir}/%{name}
 
 %changelog
+* Mon Jan 11 2010 Andrew Overholt <overholt at redhat.com> 0:1.2.6-9.4
+- Fix Group tags
+- Remove ghost symlinking in %%post{,un}
+- Add cleaning of buildroot in %%install
+- Remove dot in javadoc Summary
+- Fix URL for Source0
+- Fix mixed tabs and spaces
+
 * Mon Aug 10 2009 Ville Skyttä <ville.skytta at iki.fi> - 0:1.2.6-9.3
 - Convert specfile to UTF-8.