[Jpackage-commits] dist/felix-osgi-core/devel felix-osgi-core.spec, 1.1, 1.2

David Walluck david at ryu.zarb.org
Thu Dec 23 22:06:25 CET 2010


Update of /home/projects/jpackage/cvs/dist/felix-osgi-core/devel
In directory ryu.zarb.org:/tmp/cvs-serv23814

Modified Files:
	felix-osgi-core.spec 
Log Message:
- adapt to JPackage

Index: felix-osgi-core.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/felix-osgi-core/devel/felix-osgi-core.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** felix-osgi-core.spec	23 Dec 2010 21:04:05 -0000	1.1
--- felix-osgi-core.spec	23 Dec 2010 21:06:22 -0000	1.2
***************
*** 3,7 ****
  Name:    felix-osgi-core
  Version: 1.4.0
! Release: 5%{?dist}
  Summary: Felix OSGi R4 Core Bundle
  
--- 3,8 ----
  Name:    felix-osgi-core
  Version: 1.4.0
! Release: 6%{?dist}
! Epoch:   0
  Summary: Felix OSGi R4 Core Bundle
  
***************
*** 14,22 ****
  BuildArch: noarch
  
! BuildRequires: java-devel >= 1:1.6.0
  BuildRequires: ant
  BuildRequires: jpackage-utils
  
! Requires: java >= 1:1.6.0
  
  Requires(post):   jpackage-utils
--- 15,23 ----
  BuildArch: noarch
  
! BuildRequires: java-1.6.0-devel
  BuildRequires: ant
  BuildRequires: jpackage-utils
  
! Requires: java-1.6.0
  
  Requires(post):   jpackage-utils
***************
*** 55,61 ****
  
  # poms
! install -d -m 755 %{buildroot}%{_mavenpomdir}
  install -pm 644 pom.xml \
! %{buildroot}%{_mavenpomdir}/JPP.felix-%{bundle}.pom
  
  # javadoc
--- 56,62 ----
  
  # poms
! install -d -m 755 %{buildroot}%{_datadir}/maven2/poms
  install -pm 644 pom.xml \
! %{buildroot}%{_datadir}/maven2/poms/JPP.felix-%{bundle}.pom
  
  # javadoc
***************
*** 72,77 ****
  %defattr(-,root,root,-)
  %doc LICENSE
! %{_javadir}/felix
! %{_mavenpomdir}/JPP.felix-%{bundle}.pom
  %{_mavendepmapfragdir}/%{name}
  
--- 73,78 ----
  %defattr(-,root,root,-)
  %doc LICENSE
! %{_javadir}*/felix
! %{_datadir}/maven2/poms/JPP.felix-%{bundle}.pom
  %{_mavendepmapfragdir}/%{name}
  
***************
*** 82,85 ****
--- 83,89 ----
  
  %changelog
+ * Thu Dec 23 2010 David Walluck <dwalluck at redhat.com> 0:1.4.0-6
+ - adapt to JPackage
+ 
  * Wed Dec 15 2010 Stanislav Ochotnicky <sochotnicky at redhat.com> - 1.4.0-5
  - Remove felix-parent from Requires to prevent pulling maven in




More information about the JPackage-commits mailing list