diff --git a/baselibs.conf b/baselibs.conf
index 908bf90..e5321ca 100644
--- a/baselibs.conf
+++ b/baselibs.conf
@@ -1 +1,3 @@
-numactl
+libnumactl1
+ obsoletes "numactl-<targettype> <= <version>"
+ provides "numactl-<targettype> = <version>"
diff --git a/numactl-1.0.2.tar.gz b/numactl-1.0.2.tar.gz
deleted file mode 100644
index 28b3abb..0000000
--- a/numactl-1.0.2.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:328ca8a25dc6ded2f8a4e28134f587a13b95aedf7cd0d6836c2a33a40ecc7941
-size 49927
diff --git a/numactl-2.0.2-rc1.tar.bz2 b/numactl-2.0.2-rc1.tar.bz2
new file mode 100644
index 0000000..fdcaf65
--- /dev/null
+++ b/numactl-2.0.2-rc1.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:10355876833e791450e26a7e4d22282fae5fca921ebb6dd67bd264c9664ee2b5
+size 57819
diff --git a/numactl.changes b/numactl.changes
index 207aad6..61c8499 100644
--- a/numactl.changes
+++ b/numactl.changes
@@ -1,3 +1,45 @@
+-------------------------------------------------------------------
+Wed Jun 25 10:39:24 CEST 2008 - bwalle@suse.de
+
+- change RPM version to '2.0.1+2.0.2_rc1' for a clean update path
+- don't package the static library
+- update baselibs.conf to reflect the package split
+- remove Provides/Obsoletes since the 'numactl' package still
+ exists and provides the numactl binary
+- move Changelog from 'libnuma1' package to 'numactl' package
+
+-------------------------------------------------------------------
+Tue Jun 17 20:41:52 CEST 2008 - bwalle@suse.de
+
+- update to 2.0.2-rc1
+ o Various numademo improvements:
+ * Fix random benchmark to use all specified memory
+ * Rename to random2 to signify it's different
+ * Optimize random benchmark by inlining random number generator
+ fast path.
+ * Clear caches between runs for more stable results
+ * Add new random pointer chaser benchmark
+ * Compile benchmarks with gcc vectorization if available
+ * run numademo in regression test
+ o Add numa_exit_on_warn
+ o Fix no cpuset fallback in libnuma.c
+ o Fix no cpuset fallback in libnuma.c
+ o Install symlinks for the manpages of all new functions
+ o Make internal libnuma functions static
+ o Add copy_bitmask_to_bitmask() to numa.h
+ o Some cleanups
+ o Fix line reading in proc
+ o Add versions.ldscript to libnuma.so dependencies
+ o Remove the non-"numa_" functions from numacompat1.h and numa.h
+ o Add ia64 clearcache() to numademo
+ o Add -t to numademo for regression testing
+
+-------------------------------------------------------------------
+Wed Jun 11 10:45:49 CEST 2008 - bwalle@suse.de
+
+- update to 2.0.1 (see CHANGES file for a changelog)
+- follow shared library packaging policy
+
-------------------------------------------------------------------
Thu Apr 10 12:54:45 CEST 2008 - ro@suse.de
diff --git a/numactl.spec b/numactl.spec
index e21c6d5..e3c439e 100644
--- a/numactl.spec
+++ b/numactl.spec
@@ -1,5 +1,5 @@
#
-# spec file for package numactl (Version 1.0.2)
+# spec file for package numactl (Version 2.0.1+2.0.2_rc1)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -10,14 +10,16 @@
# norootforbuild
+Url: http://oss.sgi.com/projects/libnuma/
Name: numactl
License: GPL v2 or later
Summary: NUMA Policy Control
-Version: 1.0.2
-Release: 7
+Version: 2.0.1+2.0.2_rc1
+Release: 1
+%define tarversion 2.0.2-rc1
AutoReqProv: on
-Source: numactl-%version.tar.gz
+Source: numactl-%{tarversion}.tar.bz2
Group: System/Management
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: ia64 x86_64 ppc64 ppc
@@ -29,19 +31,53 @@ individual NUMA policy in applications.
+Authors:
+--------
+ Andi Kleen (ak@suse.de)
+ Cliff Wickman (cpw@sgi.com)
+
+%package -n libnuma1
+License: GPL v2 or later
+Summary: NUMA Policy Control
+Group: System/Management
+AutoReqProv: on
+
+%description -n libnuma1
+Control NUMA policy for individual processes. Offer libnuma for
+individual NUMA policy in applications.
+
+
+
+Authors:
+--------
+ Andi Kleen (ak@suse.de)
+ Cliff Wickman (cpw@sgi.com)
+
+%package -n libnuma-devel
+License: GPL v2 or later
+Summary: NUMA Policy Control
+Group: System/Management
+AutoReqProv: on
+Requires: libnuma1 = %{version}
+
+%description -n libnuma-devel
+Control NUMA policy for individual processes. Offer libnuma for
+individual NUMA policy in applications.
+
+
+
Authors:
--------
Andi Kleen (ak@suse.de)
Cliff Wickman (cpw@sgi.com)
%prep
-%setup
+%setup -n %{name}-%{tarversion}
%build
make CFLAGS="${RPM_OPT_FLAGS}"
%install
-rm -rf $RPM_BUILD_ROOT
install -d -m 755 $RPM_BUILD_ROOT/usr/bin
install -d -m 755 $RPM_BUILD_ROOT%{_mandir}/man8
install -d -m 755 $RPM_BUILD_ROOT%{_mandir}/man3
@@ -49,20 +85,66 @@ install -d -m 755 $RPM_BUILD_ROOT%{_mandir}/man5
install -d -m 755 $RPM_BUILD_ROOT%{_libdir}
install -d -m 755 $RPM_BUILD_ROOT/usr/include
make prefix=${RPM_BUILD_ROOT}/usr install
+rm -f $RPM_BUILD_ROOT/%{_libdir}/lib*a
%clean
rm -rf $RPM_BUILD_ROOT
+%post -n libnuma1 -p /sbin/ldconfig
+
+%postun -n libnuma1 -p /sbin/ldconfig
+
%files
%defattr(-,root,root)
-%doc %{_mandir}/man8/*
+%{_bindir}/*
+%{_mandir}/man8/*
+%doc CHANGES
+
+%files -n libnuma1
+%defattr(-,root,root)
+%{_libdir}/lib*so.*
+
+%files -n libnuma-devel
+%defattr(-,root,root)
%doc %{_mandir}/man3/*
%doc %{_mandir}/man5/*
-/usr/bin/*
-%{_libdir}/lib*
-/usr/include/*
+%{_includedir}/*
+%{_libdir}/lib*so
%changelog
+* Wed Jun 25 2008 bwalle@suse.de
+- change RPM version to '2.0.1+2.0.2_rc1' for a clean update path
+- don't package the static library
+- update baselibs.conf to reflect the package split
+- remove Provides/Obsoletes since the 'numactl' package still
+ exists and provides the numactl binary
+- move Changelog from 'libnuma1' package to 'numactl' package
+* Tue Jun 17 2008 bwalle@suse.de
+- update to 2.0.2-rc1
+ o Various numademo improvements:
+ * Fix random benchmark to use all specified memory
+ * Rename to random2 to signify it's different
+ * Optimize random benchmark by inlining random number generator
+ fast path.
+ * Clear caches between runs for more stable results
+ * Add new random pointer chaser benchmark
+ * Compile benchmarks with gcc vectorization if available
+ * run numademo in regression test
+ o Add numa_exit_on_warn
+ o Fix no cpuset fallback in libnuma.c
+ o Fix no cpuset fallback in libnuma.c
+ o Install symlinks for the manpages of all new functions
+ o Make internal libnuma functions static
+ o Add copy_bitmask_to_bitmask() to numa.h
+ o Some cleanups
+ o Fix line reading in proc
+ o Add versions.ldscript to libnuma.so dependencies
+ o Remove the non-"numa_" functions from numacompat1.h and numa.h
+ o Add ia64 clearcache() to numademo
+ o Add -t to numademo for regression testing
+* Wed Jun 11 2008 bwalle@suse.de
+- update to 2.0.1 (see CHANGES file for a changelog)
+- follow shared library packaging policy
* Thu Apr 10 2008 ro@suse.de
- added baselibs.conf file to build xxbit packages
for multilib support