[Jpackage-commits] dist/lucene/devel lucene-component-info.xml, 1.2, 1.3 lucene.spec, 1.4, 1.5

jpackage-guest jpackage-guest at ryu.zarb.org
Tue Jul 21 07:48:24 CEST 2009


Update of /home/projects/jpackage/cvs/dist/lucene/devel
In directory ryu.zarb.org:/tmp/cvs-serv14491/devel

Modified Files:
	lucene.spec 
Added Files:
	lucene-component-info.xml 
Log Message:
import 2.4.1-4 from RHEL-4-EP5

--- NEW FILE: lucene-component-info.xml ---
<project name="apache-lucene-component-info">
   <component id="apache-lucene"
              licenseType="apache-2.0"
              version="@VERSION@"
              tag="@TAG@"
              projectHome="http://lucene.apache.org/java/docs/index.html"
              description="high-performance, full-featured text search engine library">
      <artifact id="lucene.jar"/>
      
      <export>
         <include input="lucene.jar"/>         
      </export>
   </component>

</project>

Index: lucene.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/lucene/devel/lucene.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -C 2 -d -r1.4 -r1.5
*** lucene.spec	21 Jul 2009 05:41:12 -0000	1.4
--- lucene.spec	21 Jul 2009 05:48:22 -0000	1.5
***************
*** 35,38 ****
--- 35,43 ----
  
  %bcond_with             db
+ %bcond_without          repolib
+ 
+ %define repodir %{_javadir}/repository.jboss.com/apache-lucene/%{version}-brew
+ %define repodirlib %{repodir}/lib
+ %define repodirsrc %{repodir}/src
  
  %define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
***************
*** 43,47 ****
  Name:           lucene
  Version:        2.4.1
! Release:        1%{dist}
  Epoch:          0
  Summary:        High-performance, full-featured text search engine
--- 48,52 ----
  Name:           lucene
  Version:        2.4.1
! Release:        4%{dist}
  Epoch:          0
  Summary:        High-performance, full-featured text search engine
***************
*** 69,72 ****
--- 74,78 ----
  Source18:       http://repo1.maven.org/maven2/org/apache/lucene/lucene-surround/2.4.1/lucene-surround-2.4.1.pom
  Source19:       http://repo1.maven.org/maven2/org/apache/lucene/lucene-swing/2.4.1/lucene-swing-2.4.1.pom
+ # Source20:       http://repo1.maven.org/maven2/org/apache/lucene/lucene-wikipedia/2.3.2/lucene-wikipedia-2.3.2.pom
  Source21:       http://repo1.maven.org/maven2/org/apache/lucene/lucene-wordnet/2.4.1/lucene-wordnet-2.4.1.pom
  Source22:       http://repo1.maven.org/maven2/org/apache/lucene/lucene-xml-query-parser/2.4.1/lucene-xml-query-parser-2.4.1.pom
***************
*** 76,79 ****
--- 82,87 ----
  Source100:      lucene-1.9-OSGi-MANIFEST.MF
  Source200:      lucene-1.9-analysis-OSGi-MANIFEST.MF
+ # Modifed from <http://repository.jboss.com/apache-lucene/2.2.0/component-info.xml>
+ Source300:      lucene-component-info.xml
  Requires(post): jpackage-utils >= 0:1.7.3
  Requires(postun): jpackage-utils >= 0:1.7.3
***************
*** 83,87 ****
  BuildRequires:  berkeleydb >= 0:2.0.90
  # FIXME: (dwalluck): db support requires berkeleydb-native (berkeleydb-native.jar) in JPP17, db4-java (db.jar) in Fedora, db4.7 (db4.7.jar) in Mandriva
! BuildRequires:  berkeleydb-native
  %endif
  BuildRequires:  jakarta-commons-beanutils
--- 91,96 ----
  BuildRequires:  berkeleydb >= 0:2.0.90
  # FIXME: (dwalluck): db support requires berkeleydb-native (berkeleydb-native.jar) in JPP17, db4-java (db.jar) in Fedora, db4.7 (db4.7.jar) in Mandriva
! # BuildRequires:  berkeleydb-native
! BuildRequires:  db4-java
  %endif
  BuildRequires:  jakarta-commons-beanutils
***************
*** 155,159 ****
  Requires:       %{name} = %{epoch}:%{version}-%{release}
  Requires:       berkeleydb >= 0:2.0.90
! Requires:       berkeleydb-native
  
  %description contrib-db
--- 164,169 ----
  Requires:       %{name} = %{epoch}:%{version}-%{release}
  Requires:       berkeleydb >= 0:2.0.90
! # Requires:       berkeleydb-native
! Requires:       db4-java
  
  %description contrib-db
***************
*** 161,164 ****
--- 171,185 ----
  %endif
  
+ %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 -n %{oname}-%{version}
***************
*** 173,180 ****
  
  %build
  export CLASSPATH=$(build-classpath \
  %if %with db
  berkeleydb \
! berkeleydb-native \
  %endif
  commons-digester jline jtidy junit regexp)
--- 194,202 ----
  
  %build
+ # berkeleydb-native or db
  export CLASSPATH=$(build-classpath \
  %if %with db
  berkeleydb \
! db \
  %endif
  commons-digester jline jtidy junit regexp)
***************
*** 297,300 ****
--- 319,339 ----
  %endif
  
+ %if %with repolib
+ mkdir -p %{buildroot}%{repodir}
+ mkdir -p %{buildroot}%{repodirlib}
+ cp -p %{SOURCE300} %{buildroot}%{repodir}/component-info.xml
+ sed -i "s/@VERSION@/%{version}-brew/g" %{buildroot}%{repodir}/component-info.xml
+ tag=`echo %{name}-%{version}-%{release} | sed 's|\.|_|g'`
+ sed -i "s/@TAG@/$tag/g" %{buildroot}%{repodir}/component-info.xml
+ mkdir -p %{buildroot}%{repodirsrc}
+ cp -p %{SOURCE0} %{buildroot}%{repodirsrc}
+ cp -p %{SOURCE100} %{buildroot}%{repodirsrc}
+ cp -p %{SOURCE200} %{buildroot}%{repodirsrc}
+ cp -p %{PATCH0} %{buildroot}%{repodirsrc}
+ cp -p %{PATCH1} %{buildroot}%{repodirsrc}
+ cp -p %{PATCH4} %{buildroot}%{repodirsrc}
+ cp -p %{buildroot}%{_javadir}/%{name}-%{version}.jar %{buildroot}%{repodirlib}/lucene.jar
+ %endif
+ 
  %clean
  rm -rf %{buildroot}
***************
*** 409,415 ****
--- 448,471 ----
  %{_javadir}/%{name}-demos.jar
  
+ %if %with repolib
+ %files repolib
+ %defattr(0644,root,root,0755)
+ %{_javadir}/repository.jboss.com
+ %endif
+ 
  %changelog
+ * Mon Jul 20 2009 Fernando Nasser <fnasser at redhat.com> 0:2.4.1-4
+ - Rebuild
+ 
+ * Mon Jul 20 2009 Fernando Nasser <fnasser at redhat.com> 0:2.4.1-3
+ - Build with repolib
+ 
+ * Mon Jul 20 2009 Fernando Nasser <fnasser at redhat.com> 0:2.4.1-2
+   From David Walluck <dwalluck at redhat.com>:
+ - add repolib
+ 
  * Mon Jul 20 2009 Yong Yang <yyang at redhat.com> 0:2.4.1-1
  - 2.4.1
+ - replease "zip -qqu" with "jar umf" because zip return "1"
  
  * Fri Nov 14 2008 David Walluck <dwalluck at redhat.com> 0:2.4.0-1




More information about the JPackage-commits mailing list