Author: colin
Date: Wed Nov 22 17:17:45 2006
New Revision: 86238
Removed:
packages/cooker/gtk-engines2/current/SOURCES/gtk-engines-2.8.1.tar.bz2
Modified:
packages/cooker/gtk-engines2/current/SPECS/gtk-engines2.spec
Log:
Libify the engines for the benefit of x86_64 users
Modified: packages/cooker/gtk-engines2/current/SPECS/gtk-engines2.spec
==============================================================================
--- packages/cooker/gtk-engines2/current/SPECS/gtk-engines2.spec
(original)
+++ packages/cooker/gtk-engines2/current/SPECS/gtk-engines2.spec Wed Nov
22 17:17:45 2006
@@ -1,4 +1,6 @@
%define pkgname gtk-engines
+%define pkgversion 2
+%define lib_name %mklibname %{pkgname}%{pkgversion}
%define cleanice_version 2.4.0
%define xfce_version 2.3.90.1
@@ -7,10 +9,10 @@
%define gtkbinaryver %(if $([ -x %{_bindir}/pkg-config ] && pkg-config
--exists gtk+-2.0); then pkg-config --variable=gtk_binary_version gtk+-2.0;
else echo 0; fi)
-Name: %{pkgname}2
+Name: %{pkgname}%{pkgversion}
Summary: Default GTK+ 2.0 theme engines
-Version: 2.8.2
-Release: %mkrel 1
+Version: 2.8.2
+Release: %mkrel 1
License: GPL
Group: System/Libraries
BuildRequires: libglade2.0-devel
@@ -24,6 +26,7 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
Requires: gtk+2.0 >= 2.9.0
+Requires: %{lib_name} >= %{version}
Conflicts: ximian-artwork < 0.2.26-4mdk
Conflicts: gnome-themes <= 2.8.2-2mdk
Conflicts: gnome-themes-extras < 0.8.0-3mdk
@@ -40,6 +43,25 @@
- Metal (swing-like)
- Many more
+
+#--------------------------------------------------------------------
+
+%package -n %{lib_name}
+Summary: Library files for %{name}
+Group: System/Libraries
+Provides: %lib_name = %version
+
+%description -n %{lib_name}
+Library files for %{name}
+
+# Not sure if these are really needed since nothing this SRPM provides
+# ever ends up directly in %_libdir...
+%post -p /sbin/ldconfig -n %{lib_name}
+
+%postun -p /sbin/ldconfig -n %{lib_name}
+
+#--------------------------------------------------------------------
+
%prep
%setup -q -n %{pkgname}-%{version} -a 3 -a 4 -a 5 -a 7
@@ -95,16 +117,18 @@
$RPM_BUILD_ROOT%{_libdir}/gtk-2.0/%{gtkbinaryver}/engines/*.la \
$RPM_BUILD_ROOT%{_libdir}/gtk-2.0/%{gtkbinaryver}/engines/*.a
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
%clean
[ -n "%{buildroot}" -a "%{buildroot}" != / ] && rm -rf %{buildroot}
+
+#--------------------------------------------------------------------
+
%files
%defattr(-,root,root)
%doc COPYING README ChangeLog
-%{_libdir}/gtk-2.0/%{gtkbinaryver}/engines/*.so
%{_datadir}/themes/*
+
+%files -n %{lib_name}
+%defattr(-,root,root)
+%{_libdir}/gtk-2.0/%{gtkbinaryver}/engines/*.so
%{_libdir}/pkgconfig/*
