rpms/felix-osgi-core/devel import.log, NONE, 1.1 .cvsignore, 1.2, 1.3 felix-osgi-core.spec, 1.1, 1.2 sources, 1.2, 1.3 build.xml.tar.gz, 1.1, NONE
Victor G. Vasilyev
victorv at fedoraproject.org
Wed Jun 23 12:15:41 UTC 2010
Author: victorv
Update of /cvs/pkgs/rpms/felix-osgi-core/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv9674/devel
Modified Files:
.cvsignore felix-osgi-core.spec sources
Added Files:
import.log
Removed Files:
build.xml.tar.gz
Log Message:
felix-osgi-core updated to 1.4.0
--- NEW FILE import.log ---
felix-osgi-core-1_4_0-1_fc14:HEAD:felix-osgi-core-1.4.0-1.fc14.src.rpm:1277309485
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/felix-osgi-core/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore 3 Sep 2009 20:59:21 -0000 1.2
+++ .cvsignore 23 Jun 2010 12:15:40 -0000 1.3
@@ -1 +1,2 @@
-org.osgi.core-1.2.0-project.tar.gz
+felix-osgi-core-1.4.0-build.xml.tar.gz
+org.osgi.core-1.4.0-project.tar.gz
Index: felix-osgi-core.spec
===================================================================
RCS file: /cvs/pkgs/rpms/felix-osgi-core/devel/felix-osgi-core.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- felix-osgi-core.spec 3 Sep 2009 20:59:21 -0000 1.1
+++ felix-osgi-core.spec 23 Jun 2010 12:15:40 -0000 1.2
@@ -1,23 +1,28 @@
%global bundle org.osgi.core
-Name: felix-osgi-core
-Version: 1.2.0
-Release: 2%{?dist}
-Summary: Felix OSGi R4 Core Bundle
-
-Group: Development/Libraries
-License: ASL 2.0
-URL: http://felix.apache.org/site/apache-felix-osgi-core.html
-Source0: http://www.apache.org/dist/felix/org.osgi.core-%{version}-project.tar.gz
-Source1: build.xml.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: ant
-BuildRequires: jpackage-utils
-Requires: java
-Requires(post): jpackage-utils
-Requires(postun): jpackage-utils
+Name: felix-osgi-core
+Version: 1.4.0
+Release: 1%{?dist}
+Summary: Felix OSGi R4 Core Bundle
+
+Group: Development/Libraries
+License: ASL 2.0
+URL: http://felix.apache.org/site/apache-felix-osgi-core.html
+Source0: http://www.apache.org/dist/felix/org.osgi.core-%{version}-project.tar.gz
+Source1: %{name}-%{version}-build.xml.tar.gz
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
+BuildRequires: java-devel >= 1:1.6.0
+BuildRequires: ant
+BuildRequires: jpackage-utils
+
+Requires: java >= 1:1.6.0
+
+Requires(post): jpackage-utils
+Requires(postun): jpackage-utils
+
%description
OSGi Service Platform Release 4 Core Interfaces and Classes.
@@ -33,15 +38,15 @@ API documentation for %{name}.
tar xf %{SOURCE1}
-mkdir -p .m2/repository
+%__mkdir_p .m2/repository
%build
-ant -Dmaven.settings.offline=true \
- -Dmaven.repo.local=.m2/repository \
- package javadoc
+%ant -Dmaven.settings.offline=true \
+ -Dmaven.repo.local=.m2/repository \
+ package javadoc
%install
-rm -rf %{buildroot}
+%__rm -rf %{buildroot}
# jars
install -d -m 0755 %{buildroot}%{_javadir}/felix
@@ -49,7 +54,7 @@ install -m 644 target/%{bundle}-%{versio
%{buildroot}%{_javadir}/felix/%{bundle}-%{version}.jar
(cd %{buildroot}%{_javadir}/felix && for jar in *-%{version}*; \
- do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
+ do %__ln_s -f ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
%add_to_maven_depmap org.apache.felix %{bundle} %{version} JPP/felix %{bundle}
@@ -60,9 +65,9 @@ install -pm 644 pom.xml \
# javadoc
install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}-%{version}
-cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}-%{version}/
-ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
-rm -rf target/site/api*
+%__cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}-%{version}/
+%__ln_s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
+%__rm -rf target/site/api*
%post
%update_maven_depmap
@@ -71,7 +76,7 @@ rm -rf target/site/api*
%update_maven_depmap
%clean
-%{__rm} -rf %{buildroot}
+%__rm -rf %{buildroot}
%files
%defattr(-,root,root,-)
@@ -86,6 +91,11 @@ rm -rf target/site/api*
%{_javadocdir}/%{name}
%changelog
+* Tue Jun 22 2010 Victor G. Vasilyev <victor.vasilyev at sun.com> 1.4.0-1
+- Update felix-osgi-core-1.4.0-build.xml.tar.gz
+- Use the macros style
+- Release 1.4.0
+
* Thu Sep 3 2009 Alexander Kurtakov <akurtako at redhat.com> 1.2.0-2
- Fix line length.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/felix-osgi-core/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources 3 Sep 2009 20:59:21 -0000 1.2
+++ sources 23 Jun 2010 12:15:41 -0000 1.3
@@ -1 +1,2 @@
-074d678ad635cc9ffbac56e9bcde05f4 org.osgi.core-1.2.0-project.tar.gz
+6786e9401b44e651830b6a2e3584990c felix-osgi-core-1.4.0-build.xml.tar.gz
+309a1c3be449ecc280c078e2d9cde920 org.osgi.core-1.4.0-project.tar.gz
--- build.xml.tar.gz DELETED ---
More information about the scm-commits
mailing list