[Jpackage-commits] dist/nekohtml/JPP-6 nekohtml-component-info.xml, NONE, 1.1 nekohtml.spec, 1.1, 1.2

David Walluck david at ryu.zarb.org
Wed Feb 11 22:22:11 CET 2009


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

Modified Files:
	nekohtml.spec 
Added Files:
	nekohtml-component-info.xml 
Log Message:
- add repolib

Index: nekohtml.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/nekohtml/JPP-6/nekohtml.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** nekohtml.spec	11 Feb 2009 21:11:35 -0000	1.1
--- nekohtml.spec	11 Feb 2009 21:22:09 -0000	1.2
***************
*** 29,32 ****
--- 29,43 ----
  #
  
+ %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_without repolib
+ 
+ %define repodir %{_javadir}/repository.jboss.com/nekohtml/%{version}-brew
+ %define repodirlib %{repodir}/lib
+ %define repodirsrc %{repodir}/src
+ 
  %define section free
  %define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
***************
*** 34,38 ****
  Name:           nekohtml
  Version:        1.9.11
! Release:        1%{?dist}
  Epoch:          0
  Summary:        HTML scanner and tag balancer
--- 45,49 ----
  Name:           nekohtml
  Version:        1.9.11
! Release:        2%{?dist}
  Epoch:          0
  Summary:        HTML scanner and tag balancer
***************
*** 42,45 ****
--- 53,57 ----
  # http://www.jpackage.org/cgi-bin/viewvc.cgi/*checkout*/rpms/devel/nekohtml/nekohtml-filter.sh?root=jpackage&content-type=text%2Fplain
  Source1:        %{name}-filter.sh
+ Source2:        nekohtml-component-info.xml
  Patch0:         %{name}-crosslink.patch
  Patch1:         %{name}-jars.patch
***************
*** 95,98 ****
--- 107,121 ----
  Demonstrations and samples for %{name}.
  
+ %if %with repolib
+ %package repolib
+ Summary:        Artifacts to be uploaded to a repository library
+ Group:          Development/Libraries/Java
+ 
+ %description repolib
+ Artifacts to be uploaded to a repository library.
+ This package is not meant to be installed but so its contents
+ can be extracted through rpm2cpio.
+ %endif
+ 
  %prep
  %setup -q
***************
*** 136,139 ****
--- 159,177 ----
  ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
  
+ %if %with repolib
+ %{__install} -d -m 755 %{buildroot}%{repodir}
+ %{__install} -d -m 755 %{buildroot}%{repodirlib}
+ %{__install} -p -m 644 %{SOURCE2} %{buildroot}%{repodir}/component-info.xml
+ tag=`/bin/echo %{name}-%{version}-%{release} | %{__sed} 's|\.|_|g'`
+ %{__sed} -i "s/@TAG@/$tag/g" %{buildroot}%{repodir}/component-info.xml
+ %{__sed} -i "s/@VERSION@/%{version}-brew/g" %{buildroot}%{repodir}/component-info.xml
+ %{__install} -d -m 755 %{buildroot}%{repodirsrc}
+ %{__install} -p -m 644 %{SOURCE0} %{buildroot}%{repodirsrc}
+ %{__install} -p -m 644 %{SOURCE1} %{buildroot}%{repodirsrc}
+ %{__install} -p -m 644 %{PATCH0} %{buildroot}%{repodirsrc}
+ %{__install} -p -m 644 %{PATCH1} %{buildroot}%{repodirsrc}
+ %{__cp} -p %{buildroot}%{_javadir}/%{name}.jar %{buildroot}%{repodirlib}/nekohtml.jar
+ %endif
+ 
  %if %{gcj_support}
  %{_bindir}/aot-compile-rpm
***************
*** 180,184 ****
--- 218,231 ----
  %{_javadir}/%{name}-samples.jar
  
+ %if %with repolib
+ %files repolib
+ %defattr(0644,root,root,0755)
+ %{_javadir}/repository.jboss.com
+ %endif
+ 
  %changelog
+ * Wed Feb 11 2009 David Walluck <dwalluck at redhat.com> 0:1.9.11-2
+ - add repolib
+ 
  * Wed Feb 11 2009 David Walluck <dwalluck at redhat.com> 0:1.9.11-1
  - 1.9.6.1

--- NEW FILE: nekohtml-component-info.xml ---
<?xml version="1.0" encoding="UTF-8"?>
<project name="">
  <component id="nekohtml"
             licenseType=""
             version="@VERSION@"
             tag="@TAG@"
             description=""
             
             > 
              
    <artifact id="nekohtml.jar"/>


    <export>
      <include input="nekohtml.jar"/>

    </export>
  </component>
</project>




More information about the JPackage-commits mailing list