[osutil] - Cleaned up the spec file. - Re-added the changelog history.
kwright
kwright at fedoraproject.org
Thu Jan 6 23:48:01 UTC 2011
commit a722a79aa1aea7f464690d31749edc08fb8b1100
Author: Kevin Wright <kwright at redhat.com>
Date: Thu Jan 6 15:47:50 2011 -0800
- Cleaned up the spec file.
- Re-added the changelog history.
.gitignore | 1 +
clog | 2 +
osutil.spec | 99 +++++++++++++++++++++++++++++++---------------------------
sources | 2 +-
4 files changed, 57 insertions(+), 47 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 38a603f..998f3a0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
osutil-1.3.1.tar.gz
+/osutil-2.0.0.tar.gz
diff --git a/clog b/clog
new file mode 100644
index 0000000..92069fb
--- /dev/null
+++ b/clog
@@ -0,0 +1,2 @@
+- Cleaned up the spec file.
+- Re-added the changelog history.
diff --git a/osutil.spec b/osutil.spec
index fdc124f..fc121f2 100644
--- a/osutil.spec
+++ b/osutil.spec
@@ -1,29 +1,29 @@
-Name: osutil
-Version: 1.3.1
-Release: 3%{?dist}
-Summary: Operating System Utilities JNI Package
-URL: http://pki.fedoraproject.org/
-License: GPLv2
-Group: System Environment/Libraries
+Name: osutil
+Version: 2.0.0
+Release: 2%{?dist}
+Summary: Operating System Utilities JNI Package
+URL: http://pki.fedoraproject.org/
+License: GPLv2
+Group: System Environment/Libraries
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: ant
-BuildRequires: java-devel >= 1:1.6.0
-BuildRequires: jpackage-utils
-BuildRequires: nspr-devel >= 4.6.99
-BuildRequires: nss-devel >= 3.12.3.99
-BuildRequires: pkgconfig
+BuildRequires: cmake
+BuildRequires: java-devel >= 1:1.6.0
+BuildRequires: jpackage-utils
+BuildRequires: nspr-devel >= 4.6.99
+BuildRequires: nss-devel >= 3.12.3.99
+BuildRequires: pkgconfig
-Requires: java >= 1:1.6.0
-Requires: jpackage-utils
-Requires: nss >= 3.12.3.99
+Requires: java >= 1:1.6.0
+Requires: jpackage-utils
+Requires: nss >= 3.12.3.99
-Source0: http://pki.fedoraproject.org/pki/sources/%{name}/%{name}-%{version}.tar.gz
+Source0: http://pki.fedoraproject.org/pki/sources/%{name}/%{name}-%{version}.tar.gz
%if 0%{?rhel}
#rhel has no java on ppc
-ExcludeArch: ppc
+ExcludeArch: ppc ppc64
%endif
@@ -31,48 +31,53 @@ ExcludeArch: ppc
The Operating System Utilities Java Native Interface (JNI) package
supplies various native operating system operations to Java programs.
+
%prep
-%setup -q -n %{name}-%{version}
+
+%setup -q
+
+
+%clean
+%{__rm} -rf %{buildroot}
+
%build
-ant \
- -Dproduct.ui.flavor.prefix="" \
- -Dproduct.prefix="" \
- -Dproduct="%{name}" \
- -Dversion="%{version}"
-%configure \
-%ifarch ppc64 s390x sparc64 x86_64
- --enable-64bit \
-%endif
- --libdir=%{_libdir}
-make %{?_smp_mflags}
+%{__mkdir_p} build
+cd build
+%cmake -DBUILD_OSUTIL:BOOL=ON ..
+%{__make} VERBOSE=1 %{?_smp_mflags}
+
%install
-rm -rf %{buildroot}
-make install DESTDIR=%{buildroot}
+%{__rm} -rf %{buildroot}
+cd build
+%{__make} install DESTDIR=%{buildroot}
-## rearrange files to be in the desired native packaging layout
-mkdir -p %{buildroot}%{_libdir}/%{name}/
-mv %{buildroot}/opt/java/%{name}.jar %{buildroot}%{_libdir}/%{name}/%{name}-%{version}.jar
-mv %{buildroot}%{_libdir}/lib%{name}.so %{buildroot}%{_libdir}/%{name}/lib%{name}.so
-mkdir -p %{buildroot}%{_jnidir}/
-cd %{buildroot}%{_jnidir} ; ln -s %{_libdir}/%{name}/%{name}-%{version}.jar %{name}.jar
+cd %{buildroot}%{_libdir}/osutil
+%{__rm} osutil.jar
+%{__ln_s} osutil-%{version}.jar osutil.jar
-## remove unwanted files
-rm -rf %{buildroot}/opt
-rm -rf %{buildroot}%{_libdir}/lib%{name}.la
+cd %{buildroot}%{_jnidir}
+%{__rm} osutil.jar
+%{__ln_s} %{_libdir}/osutil/osutil.jar osutil.jar
-%clean
-rm -rf %{buildroot}
%files
%defattr(-,root,root,-)
%doc LICENSE
-%{_jnidir}/*
-%{_libdir}/%{name}/
+%{_jnidir}/osutil.jar
+%{_libdir}/osutil/
+
%changelog
+* Thu Jan 6 2011 Kevin Wright <kwright at redhat.com> 2.0.0-2
+- Cleaned up the spec file.
+- Re-added the changelog history.
+
+* Wed Dec 1 2010 Matthew Harmsen <mharmsen at redhat.com> 2.0.0-1
+- Initial 2.0 revision. (kwright at redhat.com & mharmsen at redhat.com)
+
* Mon Feb 01 2010 Kevin Wright <kwright at redhat.com> 1.3.1-3
- no java on rhel ppc
@@ -94,3 +99,5 @@ rm -rf %{buildroot}
* Thu Oct 8 2009 Matthew Harmsen <mharmsen at redhat.com> 1.3.0-1
- Bugzilla Bug #521983 - New package for Dogtag PKI: osutil
+
+
diff --git a/sources b/sources
index 1a2491a..811f55f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3bbf5eec8347db610e3b927fe7e9c876 osutil-1.3.1.tar.gz
+e8c0faf9f279d2128eb0f5e3ed16fa4c osutil-2.0.0.tar.gz
More information about the scm-commits
mailing list