[Jpackage-commits] dist/nekohtml/JPP-6 nekohtml.spec,1.4,1.5

David Walluck david at ryu.zarb.org
Mon Oct 24 22:08:21 CEST 2011


Update of /home/projects/jpackage/cvs/dist/nekohtml/JPP-6
In directory ryu.zarb.org:/tmp/cvs-serv3905

Modified Files:
	nekohtml.spec 
Log Message:
- javadoc Requires jpackage-utils

Index: nekohtml.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/nekohtml/JPP-6/nekohtml.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -C 2 -d -r1.4 -r1.5
*** nekohtml.spec	11 Dec 2010 01:30:25 -0000	1.4
--- nekohtml.spec	24 Oct 2011 20:08:19 -0000	1.5
***************
*** 1,3 ****
! # Copyright (c) 2000-2010, JPackage Project
  # All rights reserved.
  #
--- 1,3 ----
! # Copyright (c) 2000-2011, JPackage Project
  # All rights reserved.
  #
***************
*** 27,49 ****
  # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- #
- 
- %define with()          %{expand:%%{?with_%{1}:1}%%{!?with_%{1}:0}}
- %define without()       %{expand:%%{?with_%{1}:0}%%{!?with_%{1}:1}}
- %define bcond_with()    %{expand:%%{?_with_%{1}:%%global with_%{1} 1}}
- %define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}}
  
- %bcond_with gcj_support
  %bcond_without repolib
  
! %if %with gcj_support
! %define gcj_support 1
! %else
! %define gcj_support 0
! %endif
! 
! %define repodir %{_javadir}/repository.jboss.com/nekohtml/%{version}-brew
! %define repodirlib %{repodir}/lib
! %define repodirsrc %{repodir}/src
  
  %define xerces_version 2.9.1
--- 27,36 ----
  # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  
  %bcond_without repolib
  
! %global repodir %{_javadir}/repository.jboss.com/nekohtml/%{version}-brew
! %global repodirlib %{repodir}/lib
! %global repodirsrc %{repodir}/src
  
  %define xerces_version 2.9.1
***************
*** 53,57 ****
  Name:           nekohtml
  Version:        1.9.14
! Release:        1%{?dist}
  Epoch:          0
  Summary:        HTML scanner and tag balancer
--- 40,44 ----
  Name:           nekohtml
  Version:        1.9.14
! Release:        4%{?dist}
  Epoch:          0
  Summary:        HTML scanner and tag balancer
***************
*** 84,93 ****
  BuildRequires:  xerces-j2-javadoc-impl
  BuildRequires:  xml-commons-jaxp-1.3-apis
- %if %{gcj_support}
- BuildRequires:  java-gcj-compat-devel
- %else
  BuildArch:      noarch
  BuildRequires:  java-devel
- %endif
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
  
--- 71,76 ----
***************
*** 108,111 ****
--- 91,95 ----
  Summary:        Javadoc for %{name}
  Group:          Development/Documentation
+ Requires:       jpackage-utils
  
  %description javadoc
***************
*** 197,224 ****
  %endif
  
- %if %{gcj_support}
- %{_bindir}/aot-compile-rpm
- %endif
- 
  %clean
  rm -rf %{buildroot}
  
  %post
- %if %{gcj_support}
- if [ -x %{_bindir}/rebuild-gcj-db ]
- then
-   %{_bindir}/rebuild-gcj-db
- fi
- %endif
  %update_maven_depmap
  
  %postun
  %update_maven_depmap
- %if %{gcj_support}
- if [ -x %{_bindir}/rebuild-gcj-db ]
- then
-   %{_bindir}/rebuild-gcj-db
- fi
- %endif
  
  %files
--- 181,192 ----
***************
*** 232,239 ****
  %{_datadir}/maven2/poms/JPP-%{name}.pom
  %{_mavendepmapfragdir}/%{name}
- %if %{gcj_support}
- %dir %{_libdir}/gcj/%{name}
- %attr(-,root,root) %{_libdir}/gcj/%{name}/*
- %endif
  
  %files javadoc
--- 200,203 ----
***************
*** 251,258 ****
--- 215,232 ----
  %defattr(0644,root,root,0755)
  %dir %{_javadir}*
+ %exclude %dir %{_javadocdir}
  %{_javadir}*/repository.jboss.com
  %endif
  
  %changelog
+ * Mon Oct 24 2011 David Walluck <dwalluck at redhat.com> 0:1.9.14-4
+ - javadoc Requires jpackage-utils
+ 
+ * Mon Oct 24 2011 David Walluck <dwalluck at redhat.com> 0:1.9.14-3
+ - fix repolib file ownership
+ 
+ * Mon Oct 24 2011 David Walluck <dwalluck at redhat.com> 0:1.9.14-2
+ - remove GCJ support
+ 
  * Fri Dec 10 2010 David Walluck <dwalluck at redhat.com> 0:1.9.14-1
  - 1.9.14




More information about the JPackage-commits mailing list