[Jpackage-commits] dist/facelets/JPP-6 facelets.spec, 1.3, 1.4 sources, 1.1, 1.2

David Walluck david at ryu.zarb.org
Wed Feb 4 00:03:59 CET 2009


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

Modified Files:
	facelets.spec sources 
Log Message:
- 1.1.15 beta 1
- add repolib
- add jsf-facelets compatibility symlinks


Index: sources
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/facelets/JPP-6/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** sources	18 Dec 2008 19:09:51 -0000	1.1
--- sources	3 Feb 2009 23:03:57 -0000	1.2
***************
*** 1 ****
! 42f134ef973961580cf4ff75bf9b3283  facelets-1.1.14.tar.gz
--- 1 ----
! 27289696ffaa318e957c923404f747c5  facelets-1.1.15.tar.bz2

Index: facelets.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/facelets/JPP-6/facelets.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -C 2 -d -r1.3 -r1.4
*** facelets.spec	20 Jan 2009 20:56:11 -0000	1.3
--- facelets.spec	3 Feb 2009 23:03:57 -0000	1.4
***************
*** 29,55 ****
  #
  
  %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:           facelets
! Version:        1.1.14
! Release:        2%{?dist}
  Epoch:          0
  Summary:        JavaServer Faces View Definition Framework
  License:        ASL 2.0
- Source0:        facelets-%{version}.tar.gz
- # cvs -d :pserver:guest at cvs.dev.java.net:/cvs login
- # cvs -d :pserver:guest at cvs.dev.java.net:/cvs export -r milestone_1-1-14 facelets 
- URL:            https://facelets.dev.java.net/
  Group:          Development/Libraries/Java
! 
! %if %{gcj_support}
! BuildRequires:  java-gcj-compat-devel
! %else
! BuildArch:      noarch
! BuildRequires:  java-devel >= 0:1.5
! %endif
! 
  BuildRequires:  ant
  BuildRequires:  jpackage-utils
--- 29,64 ----
  #
  
+ %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/com/sun/facelets/%{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}}}
  
! %define section free
  
  Name:           facelets
! Version:        1.1.15
! Release:        0.b1.1%{?dist}
  Epoch:          0
  Summary:        JavaServer Faces View Definition Framework
  License:        ASL 2.0
  Group:          Development/Libraries/Java
! URL:            https://facelets.dev.java.net/
! # cvs -Q -d :pserver:guest at cvs.dev.java.net:/cvs export -d facelets-1.1.15 -r milestone_1-1-15-beta facelets && tar cjf facelets-1.1.15.tar.bz2 facelets-1.1.15
! Source0:        facelets-%{version}.tar.bz2
! Source1:        facelets-component-info.xml
! Requires(post): jpackage-utils >= 0:1.7.5
! Requires(postun): jpackage-utils >= 0:1.7.5
! Requires:       el_1_0_api
! Requires:       el-impl
! Requires:       jsf_1_2_api
! Requires:       servlet_2_4_api
  BuildRequires:  ant
  BuildRequires:  jpackage-utils
***************
*** 58,71 ****
  BuildRequires:  jsf_1_2_api
  BuildRequires:  servlet_2_4_api
! 
! Requires(post):    jpackage-utils >= 0:1.7.5
! Requires(postun):  jpackage-utils >= 0:1.7.5
! 
! Requires:  el_1_0_api
! Requires:  el-impl
! Requires:  jsf_1_2_api
! Requires:  servlet_2_4_api
! 
! BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
  
  %description
--- 67,77 ----
  BuildRequires:  jsf_1_2_api
  BuildRequires:  servlet_2_4_api
! %if %{gcj_support}
! BuildRequires:  java-gcj-compat-devel
! %else
! BuildArch:      noarch
! BuildRequires:  java-devel >= 0:1.5
! %endif
! BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
  
  %description
***************
*** 98,106 ****
  %{summary}.
  
  %prep
! %setup -q -n %{name}
! for j in $(find . -name "*.jar"); do
!     mv $j $j.no
! done
  
  mkdir lib
--- 104,121 ----
  %{summary}.
  
+ %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
! %{_bindir}/find . -name "*.jar" | %{_bindir}/xargs -t %{__rm}
  
  mkdir lib
***************
*** 110,114 ****
  ln -sf $(build-classpath el-impl) lib/el-impl-1.0.jar
  
- 
  %build
  export CLASSPATH=
--- 125,128 ----
***************
*** 121,130 ****
  # jars
  %{__mkdir_p} %{buildroot}%{_javadir}
! %{__cp} -a dist/jsf-facelets.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
  (cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do %{__ln_s} ${jar} `echo $jar| %{__sed} "s|-%{version}||g"`; done)
  
  # poms
  %{__mkdir_p} %{buildroot}%{_datadir}/maven2/poms
! sed -i -e 's/@VERSION@/%{version}/' jsf-%{name}.pom
  %{__cp} -a jsf-%{name}.pom $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
  %add_to_maven_depmap com.sun.facelets jsf-%{name} %{version} JPP %{name}
--- 135,145 ----
  # jars
  %{__mkdir_p} %{buildroot}%{_javadir}
! %{__cp} -p dist/jsf-facelets.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
! %{__cp} -p dist/jsf-facelets.jar %{buildroot}%{_javadir}/jsf-facelets-%{version}.jar
  (cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do %{__ln_s} ${jar} `echo $jar| %{__sed} "s|-%{version}||g"`; done)
  
  # poms
  %{__mkdir_p} %{buildroot}%{_datadir}/maven2/poms
! %{__sed} -i -e 's/@VERSION@/%{version}/' jsf-%{name}.pom
  %{__cp} -a jsf-%{name}.pom $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
  %add_to_maven_depmap com.sun.facelets jsf-%{name} %{version} JPP %{name}
***************
*** 134,137 ****
--- 149,166 ----
  %{__cp} -a build/docs/api/* %{buildroot}%{_javadocdir}/%{name}-%{version}
  %{__ln_s} %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
+ %{__ln_s} %{name}-%{version} %{buildroot}%{_javadocdir}/jsf-facelets-%{version}
+ %{__ln_s} jsf-facelets-%{version} %{buildroot}%{_javadocdir}/jsf-facelets
+ 
+ %if %with repolib
+ %{__install} -d -m 0755 %{buildroot}%{repodir}
+ %{__install} -d -m 0755 %{buildroot}%{repodirlib}
+ %{__install} -p -m 0644 %{SOURCE1} %{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 0755 %{buildroot}%{repodirsrc}
+ %{__install} -p -m 0644 %{SOURCE0} %{buildroot}%{repodirsrc}
+ %{__cp} -p %{buildroot}%{_javadir}/%{name}-%{version}.jar %{buildroot}%{repodirlib}/jsf-facelets.jar
+ %endif
  
  %if %{gcj_support}
***************
*** 162,171 ****
  %files
  %defattr(0644,root,root,0755)
! %{_javadir}/*.jar
  %if %{gcj_support}
  %dir %{_libdir}/gcj/%{name}
  %attr(-,root,root) %{_libdir}/gcj/%{name}/*
  %endif
- %{_datadir}/maven2/*
  %{_mavendepmapfragdir}/*
  
--- 191,203 ----
  %files
  %defattr(0644,root,root,0755)
! %{_datadir}/maven2/*
! %{_javadir}/%{name}-%{version}.jar
! %{_javadir}/%{name}.jar
! %{_javadir}/jsf-facelets-%{version}.jar
! %{_javadir}/jsf-facelets.jar
  %if %{gcj_support}
  %dir %{_libdir}/gcj/%{name}
  %attr(-,root,root) %{_libdir}/gcj/%{name}/*
  %endif
  %{_mavendepmapfragdir}/*
  
***************
*** 180,185 ****
--- 212,230 ----
  %{_javadocdir}/%{name}-%{version}
  %{_javadocdir}/%{name}
+ %{_javadocdir}/jsf-facelets-%{version}
+ %{_javadocdir}/jsf-facelets
+ 
+ %if %with repolib
+ %files repolib
+ %defattr(0644,root,root,0755)
+ %{_javadir}/repository.jboss.com
+ %endif
  
  %changelog
+ * Tue Feb 03 2009 David Walluck <dwalluck at redhat.com> 0:1.1.15-0.b1.1
+ - 1.1.15 beta 1
+ - add repolib
+ - add jsf-facelets compatibility symlinks
+ 
  * Tue Jan 20 2009 Ralph Apel <r.apel at r-apel.de> 0:1.1.14-2
  - Fix depmap frag 




More information about the JPackage-commits mailing list