[xjavadoc] * Fri Sep 24 2010 Alexander Kurtakov <akurtako at redhat.com> 0:1.1-8 - Drop gcj_support. - Add shell s

Alexander Kurtakov akurtakov at fedoraproject.org
Fri Sep 24 18:15:03 UTC 2010 

commit 490c0ae3731ba273673095b7a2d0e496dc2c681f
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Fri Sep 24 21:14:22 2010 +0300

    * Fri Sep 24 2010 Alexander Kurtakov <akurtako at redhat.com> 0:1.1-8
    - Drop gcj_support.
    - Add shell script to generate tarball.
    - Fix permissions.
    - Drop buildroot.

 .gitignore       |    1 +
 fetch-sources.sh |    7 +++
 sources          |    2 +-
 xjavadoc.spec    |  158 +++++++++++++++++++-----------------------------------
 4 files changed, 65 insertions(+), 103 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9e73e6d..aeac180 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ xjavadoc-src-1.1-RHCLEAN.tar.bz2
 xjavadoc
 noarch
 *.src.rpm
+xjavadoc-src-1.1.tar.xz
diff --git a/fetch-sources.sh b/fetch-sources.sh
new file mode 100644
index 0000000..ae248ba
--- /dev/null
+++ b/fetch-sources.sh
@@ -0,0 +1,7 @@
+#/bin/sh
+cvs -d:pserver:anonymous at xdoclet.cvs.sourceforge.net:/cvsroot/xdoclet export -r XJAVADOC_1_1 xjavadoc
+pushd xjavadoc
+find . -name "*.zip" -exec rm {} \;
+find . -name "*.jar" -exec rm {} \;
+popd
+tar caf xjavadoc-src-1.1.tar.xz xjavadoc
\ No newline at end of file
diff --git a/sources b/sources
index 565bb85..668f560 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b9ab69d0d30f49ee9824947ebac395e8  xjavadoc-src-1.1-RHCLEAN.tar.bz2
+43662c4ce6b1084edf1240bb2a4fc0e1  xjavadoc-src-1.1.tar.xz
diff --git a/xjavadoc.spec b/xjavadoc.spec
index 82b6d02..d798855 100644
--- a/xjavadoc.spec
+++ b/xjavadoc.spec
@@ -28,72 +28,53 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-%define _with_gcj_support 1
-
-%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
-
-Name:		xjavadoc
-Version:	1.1
-Release:	7.5%{?dist}
-Epoch:		0
-Summary:	The XJavaDoc engine
-License:	BSD
-URL:		http://xdoclet.sourceforge.net/xjavadoc/
-Group:		Development/Testing
-Source0:	xjavadoc-src-1.1-RHCLEAN.tar.bz2
-# cvs -d:pserver:anonymous at cvs.sourceforge.net:/cvsroot/xdoclet login
-# cvs -z3 -d:pserver:anonymous at cvs.sourceforge.net:/cvsroot/xdoclet export -r XJAVADOC_1_1 xjavadoc
-Patch0:		%{name}-build_xml.patch
-BuildRequires:	java
-BuildRequires:	java-devel >= 0:1.4.2
-BuildRequires:	jpackage-utils
-BuildRequires:	junit
-BuildRequires:	ant >= 0:1.6
-BuildRequires:	ant-nodeps >= 0:1.6
-BuildRequires:	ant-junit >= 0:1.6
-BuildRequires:	jakarta-commons-logging
-BuildRequires:	jakarta-commons-collections
-BuildRequires:	xml-commons-apis
-BuildRequires:	log4j
-BuildRequires:	javacc
-BuildRequires:	xalan-j2
-BuildRequires:	jrefactory
-Requires:	java
-Requires:	jakarta-commons-logging
-Requires:	jakarta-commons-collections
-Requires:	xml-commons-apis
-Requires:	log4j
-Requires:	xalan-j2
-Requires:	jrefactory
-%if ! %{gcj_support}
-BuildArch:	noarch
-%endif
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
-
-%if %{gcj_support}
-BuildRequires:		java-gcj-compat-devel
-Requires(post):		java-gcj-compat
-Requires(postun):	java-gcj-compat
-%endif
+Name:       xjavadoc
+Version:    1.1
+Release:    8%{?dist}
+Epoch:      0
+Summary:    JavaDoc engine that is fast and more suited for XDoclet
+License:    BSD
+URL:        http://xdoclet.sourceforge.net/xjavadoc/
+Group:      Development/Tools
+Source0:    xjavadoc-src-1.1.tar.xz
+Source1:    fetch-sources.sh
+Patch0:     xjavadoc-build_xml.patch
+BuildRequires:  java
+BuildRequires:  java-devel >= 0:1.4.2
+BuildRequires:  jpackage-utils
+BuildRequires:  junit
+BuildRequires:  ant >= 0:1.6
+BuildRequires:  ant-nodeps >= 0:1.6
+BuildRequires:  ant-junit >= 0:1.6
+BuildRequires:  apache-commons-logging
+BuildRequires:  jakarta-commons-collections
+BuildRequires:  xml-commons-apis
+BuildRequires:  log4j
+BuildRequires:  javacc
+BuildRequires:  xalan-j2
+BuildRequires:  jrefactory
+Requires:   java
+Requires:   apache-commons-logging
+Requires:   jakarta-commons-collections
+Requires:   xml-commons-apis
+Requires:   log4j
+Requires:   xalan-j2
+Requires:   jrefactory
+BuildArch:  noarch
 
 %description
-The XJavaDoc engine is a complete rewrite of Sun's 
-JavaDoc engine that is faster and more suited for 
-XDoclet (although it is completely standalone). It 
-scans java source code and makes information about 
-a class available via special java beans that are 
-part of the XJavaDoc core. These beans provide the 
-same information about a class as Sun's JavaDoc API, 
-and some nice extra features. 
+A complete rewrite of Sun's JavaDoc engine that is 
+faster and more suited for XDoclet (although it is
+completely standalone). It scans java source code 
+and makes information about a class available via
+special java beans that are part of the XJavaDoc core.
+These beans provide the same information about a class
+as Sun's JavaDoc API, and some nice extra features. 
 
 %package        javadoc
 Summary:        Javadoc for %{name}
-Group:          Development/Documentation
-# for /bin/rm and /bin/ln
-Requires(post):   coreutils
-Requires(postun): coreutils
+Group:          Documentation
+Requires:       jpackage-utils
 
 %description    javadoc
 %{summary}.
@@ -102,8 +83,8 @@ Requires(postun): coreutils
 %setup -q -n %{name}
 find . -name "*.zip" -exec rm {} \;
 find . -name "*.jar" -exec rm {} \;
+%patch0
 
-%patch0 -b .sav
 
 %build
 build-jar-repository -s -p lib \
@@ -118,9 +99,6 @@ jrefactory \
 ant \
 
 
-#Fix these binary deps
-#BINCLASSPATH=$PWD/lib/ConfigLog4j.jar
-
 ant -Djavacchome=/usr/share/java javadoc
 
 %install
@@ -140,55 +118,30 @@ install -m 644 docs/architecture.txt $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version
 #javadoc
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
-
-%if %{gcj_support}
-%{_bindir}/aot-compile-rpm
-%endif
+ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} 
 
 %clean
-[ "$RPM_BUILD_ROOT" != "/" ] && 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 ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%postun
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
+rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(0644,root,root,0755)
+%defattr(-,root,root,-)
+%doc LICENSE.txt
 %{_javadir}/*
 %{_docdir}/%{name}-%{version}
 
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}
-%endif
-
 %files javadoc
 %defattr(-,root,root,-)
+%doc LICENSE.txt
 %doc %{_javadocdir}/%{name}-%{version}
-%ghost %doc %{_javadocdir}/%{name}
+%doc %{_javadocdir}/%{name}
 
 %changelog
+* Fri Sep 24 2010 Alexander Kurtakov <akurtako at redhat.com> 0:1.1-8
+- Drop gcj_support.
+- Add shell script to generate tarball.
+- Fix permissions.
+- Drop buildroot.
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.1-7.5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -239,3 +192,4 @@ fi
 
 * Mon Dec 15 2003 Paul Nasrat <pauln at truemesh.com> 1.0-1jpp
 - Initial Release
+

More information about the scm-commits mailing list