- updated to 008

- removed libtool patch (libtool support and static library gone)
- thus -devel O: cpufrequtils-static

Changed files:
    cpufrequtils-libtool.patch -> 1.2
    cpufrequtils.spec -> 1.20

diff --git a/cpufrequtils-libtool.patch b/cpufrequtils-libtool.patch
deleted file mode 100644 (file)
index dce217d..0000000
--- a/cpufrequtils-libtool.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- cpufrequtils-002/Makefile~ 2006-06-01 11:54:41.000000000 +0300
-+++ cpufrequtils-002/Makefile  2007-12-16 15:35:02.665877679 +0200
-@@ -177,14 +177,14 @@
-       @$(HOSTCC) -O1 build/ccdv.c -o build/ccdv
- 
- %.lo: $(LIB_OBJS) $(LIB_HEADERS)
--      $(QUIET) $(LIBTOOL) $(LIBTOOL_OPT) --mode=compile $(CC) $(CFLAGDEF) $(CFLAGS) -o $@ -c $*.c
-+      $(QUIET) $(LIBTOOL) $(LIBTOOL_OPT) --mode=compile --tag=CC $(CC) $(CFLAGDEF) $(CFLAGS) -o $@ -c $*.c
- 
- libcpufreq.la: $(LIB_OBJS) $(LIB_HEADERS) $(LIB_PARTS) Makefile
-       @if [ $(strip $(SYSFS)) != true -a $(strip $(PROC)) != true ]; then \
-               echo '*** At least one of /sys support or /proc support MUST be enabled ***'; \
-               exit -1; \
-       fi;
--      $(QUIET) $(LIBTOOL) $(LIBTOOL_OPT) --mode=link $(CC) $(CFLAGDEF) $(CFLAGS) $(LDFLAGS) -o libcpufreq.la -rpath \
-+      $(QUIET) $(LIBTOOL) $(LIBTOOL_OPT) --mode=link --tag=CC $(CC) $(CFLAGDEF) $(CFLAGS) $(LDFLAGS) -o libcpufreq.la -rpath \
-               ${libdir} -version-info $(LIB_VERSION) $(LIB_PARTS)
- 
- libcpufreq: libcpufreq.la

diff --git a/cpufrequtils.spec b/cpufrequtils.spec
index 657fd584ac0d8a16c81dbc9c75e1204619b20546..787262dd3b027e04fca69a81d8e35aeda124e64b 100644 (file)
--- a/cpufrequtils.spec
+++ b/cpufrequtils.spec
@@ -3,26 +3,24 @@
 %bcond_without sysfs   # sysfs support
 %bcond_without procfs  # procfs support
 #
-Summary:       Scales your CPU frequency
+Summary:       Scaling your CPU frequency
 Summary(pl.UTF-8):     Skalowanie częstotliwości procesora
 Name:          cpufrequtils
-Version:       005
+Version:       008
 Release:       1
 Epoch:         1
 License:       GPL v2
 Group:         Applications/System
 Source0:       http://www.kernel.org/pub/linux/utils/kernel/cpufreq/%{name}-%{version}.tar.bz2
-# Source0-md5: 73a41589fe74b73fc530f4179f2c6142
-Patch0:                %{name}-libtool.patch
+# Source0-md5: c59b71c044d463896f3247e8dd83dd7e
 URL:           http://www.kernel.org/pub/linux/utils/kernel/cpufreq/cpufrequtils.html
 BuildRequires: gettext-devel
-BuildRequires: libtool
 %{?with_sysfs:BuildRequires:   sysfsutils-devel >= 1.3.0-3}
 Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
-Scales your CPU frequency.
+Scaling your CPU frequency.
 
 %description -l pl.UTF-8
 Skalowanie częstotliwości procesora.
@@ -44,6 +42,7 @@ Summary(pl.UTF-8):    Plik nagłówkowy biblioteki libcpufreq
 Group:         Development/Libraries
 Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
 %{?with_sysfs:Requires:        sysfsutils-devel >= 1.3.0-3}
+Obsoletes:     cpufrequtils-static
 
 %description devel
 Header file for libcpufreq library.
@@ -51,21 +50,8 @@ Header file for libcpufreq library.
 %description devel -l pl.UTF-8
 Plik nagłówkowy biblioteki libcpufreq.
 
-%package static
-Summary:       Static libcpufreq library
-Summary(pl.UTF-8):     Statyczna biblioteka libcpufreq
-Group:         Development/Libraries
-Requires:      %{name}-devel = %{epoch}:%{version}-%{release}
-
-%description static
-Static libcpufreq library.
-
-%description static -l pl.UTF-8
-Statyczna biblioteka libcpufreq.
-
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %{__make} \
@@ -100,13 +86,9 @@ rm -rf $RPM_BUILD_ROOT
 %files libs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libcpufreq.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libcpufreq.so.0
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libcpufreq.so
-%{_libdir}/libcpufreq.la
 %{_includedir}/cpufreq.h
-
-%files static
-%defattr(644,root,root,755)
-%{_libdir}/libcpufreq.a