diff --git a/.cvsignore b/.cvsignore
index 2203b2a..4021c8c 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -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
diff --git a/build.xml.tar.gz b/build.xml.tar.gz
deleted file mode 100644
index 688c503..0000000
Binary files a/build.xml.tar.gz and /dev/null differ
diff --git a/felix-osgi-core.spec b/felix-osgi-core.spec
index 4d81306..5a8e835 100644
--- a/felix-osgi-core.spec
+++ b/felix-osgi-core.spec
@@ -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}-%{version}.jar \
         %{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@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@redhat.com> 1.2.0-2
 - Fix line length.
 
diff --git a/import.log b/import.log
new file mode 100644
index 0000000..70cd663
--- /dev/null
+++ b/import.log
@@ -0,0 +1 @@
+felix-osgi-core-1_4_0-1_fc14:HEAD:felix-osgi-core-1.4.0-1.fc14.src.rpm:1277309485
diff --git a/sources b/sources
index 6c6576c..fd02be3 100644
--- a/sources
+++ b/sources
@@ -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