[Jpackage-commits] dist/bsf/JPP-6 bsf.spec,1.11,1.12

David Walluck david at ryu.zarb.org
Thu Oct 6 17:14:00 CEST 2011


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

Modified Files:
	bsf.spec 
Log Message:
- fix depmap install
- remove GCJ support
- fix repolib option
- bump release (for mdv)


Index: bsf.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/bsf/JPP-6/bsf.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -C 2 -d -r1.11 -r1.12
*** bsf.spec	11 Feb 2011 00:46:07 -0000	1.11
--- bsf.spec	6 Oct 2011 15:13:58 -0000	1.12
***************
*** 1,3 ****
! # Copyright (c) 2000-2008, JPackage Project
  # All rights reserved.
  #
--- 1,3 ----
! # Copyright (c) 2000-2011, JPackage Project
  # All rights reserved.
  #
***************
*** 27,41 ****
  # (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 gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
- 
- # If you want repolib package to be built,
- # issue the following: 'rpmbuild --with repolib'
- 
- %define _with_repolib 1
  
! %define with_repolib %{?_with_repolib:1}%{!?_with_repolib:0}
! %define without_repolib %{!?_with_repolib:1}%{?_with_repolib:0}
  
  %define repodir %{_javadir}/repository.jboss.com/apache-bsf/%{version}-brew
--- 27,32 ----
  # (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
  
  %define repodir %{_javadir}/repository.jboss.com/apache-bsf/%{version}-brew
***************
*** 43,51 ****
  %define repodirsrc %{repodir}/src
  
! %define section                free
  
  Name:           bsf
  Version:        2.4.0
! Release:        3%{?dist}
  Epoch:          0
  Summary:        Bean Scripting Framework
--- 34,42 ----
  %define repodirsrc %{repodir}/src
  
! %define section free
  
  Name:           bsf
  Version:        2.4.0
! Release:        11%{?dist}
  Epoch:          0
  Summary:        Bean Scripting Framework
***************
*** 82,90 ****
  BuildRequires:  velocity14
  BuildRequires:  xalan-j2
- %if %{gcj_support}
- BuildRequires:  java-gcj-compat-devel
- %else
  BuildArch:      noarch
- %endif
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
  
--- 73,77 ----
***************
*** 115,119 ****
  * JudoScript
  
! %if %{with_repolib}
  %package repolib
  Summary:        Artifacts to be uploaded to a repository library
--- 102,106 ----
  * JudoScript
  
! %if %with repolib
  %package repolib
  Summary:        Artifacts to be uploaded to a repository library
***************
*** 143,147 ****
  %prep
  %setup -q
! %patch0 -p1
  %{_bindir}/find -name "*.jar" | %{_bindir}/xargs -t %{__rm}
  %{__rm} -r docs/
--- 130,134 ----
  %prep
  %setup -q
! %patch0 -p1 -b .sav0
  %{_bindir}/find -name "*.jar" | %{_bindir}/xargs -t %{__rm}
  %{__rm} -r docs/
***************
*** 158,179 ****
  
  %install
! %{__rm} -fr %{buildroot}
  
  # jar
  %{__install} -d -m 755 %{buildroot}%{_javadir}
  %{__install} -p -m 644 dist/bsf-%{version}/lib/bsf.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
! (cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} ${jar/-%{version}/}; done)
  
  # pom and depmap frag
  %{__install} -d -m 755 %{buildroot}%{_datadir}/maven2/poms
! %{__install} -m 644 %{SOURCE2} %{buildroot}%{_datadir}/maven2/poms/JPP-bsf.pom
! %add_to_maven_depmap %{name} %{name} %{version} JPP %{name}
  
  # javadoc
  %{__install} -d -m 755 %{buildroot}%{_javadocdir}/%{name}-%{version}
  %{__cp} -pr dist/bsf-%{version}/docs/api/* %{buildroot}%{_javadocdir}/%{name}-%{version}
! (cd %{buildroot}%{_javadocdir} && ln -sf %{name}-%{version} %{name})
  
! %if %{with_repolib}
  %{__install} -d -m 755 %{buildroot}%{repodir}
  %{__install} -d -m 755 %{buildroot}%{repodirlib}
--- 145,166 ----
  
  %install
! %{__rm} -rf %{buildroot}
  
  # jar
  %{__install} -d -m 755 %{buildroot}%{_javadir}
  %{__install} -p -m 644 dist/bsf-%{version}/lib/bsf.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
! (cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -s ${jar} ${jar/-%{version}/}; done)
  
  # pom and depmap frag
  %{__install} -d -m 755 %{buildroot}%{_datadir}/maven2/poms
! %{__install} -p -m 644 %{SOURCE2} %{buildroot}%{_datadir}/maven2/poms/JPP-bsf.pom
! %add_to_maven_depmap bsf bsf %{version} JPP %{name}
  
  # javadoc
  %{__install} -d -m 755 %{buildroot}%{_javadocdir}/%{name}-%{version}
  %{__cp} -pr dist/bsf-%{version}/docs/api/* %{buildroot}%{_javadocdir}/%{name}-%{version}
! (cd %{buildroot}%{_javadocdir} && ln -s %{name}-%{version} %{name})
  
! %if %with repolib
  %{__install} -d -m 755 %{buildroot}%{repodir}
  %{__install} -d -m 755 %{buildroot}%{repodirlib}
***************
*** 186,211 ****
  %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
  
  %postun
! %if %{gcj_support}
! if [ -x %{_bindir}/rebuild-gcj-db ]
! then
!   %{_bindir}/rebuild-gcj-db
! fi
! %endif
  
  %files
--- 173,184 ----
  %endif
  
  %clean
  %{__rm} -rf %{buildroot}
  
  %post
! %update_maven_depmap
  
  %postun
! %update_maven_depmap
  
  %files
***************
*** 214,223 ****
  %{_javadir}/%{name}-%{version}.jar
  %{_javadir}/%{name}.jar
! %{_datadir}/maven2/poms/*
! %{_mavendepmapfragdir}/*
! %if %{gcj_support}
! %dir %{_libdir}/gcj/%{name}
! %attr(-,root,root) %{_libdir}/gcj/%{name}/*
! %endif
  
  %files javadoc
--- 187,192 ----
  %{_javadir}/%{name}-%{version}.jar
  %{_javadir}/%{name}.jar
! %{_datadir}/maven2/poms/JPP-%{name}.pom
! %{_mavendepmapfragdir}/%{name}
  
  %files javadoc
***************
*** 230,234 ****
  %doc docs/*
  
! %if %{with_repolib}
  %files repolib
  %defattr(0644,root,root,0755)
--- 199,203 ----
  %doc docs/*
  
! %if %with repolib
  %files repolib
  %defattr(0644,root,root,0755)
***************
*** 238,241 ****
--- 207,216 ----
  
  %changelog
+ * Tue Oct 06 2011 David Walluck <dwalluck at redhat.com> 0:2.4.0-11
+ - fix depmap install
+ - remove GCJ support
+ - fix repolib option
+ - bump release (for mdv)
+ 
  * Thu Feb 10 2011 David Walluck <dwalluck at redhat.com> 0:2.4.0-3
  - use servlet_2_5_api




More information about the JPackage-commits mailing list