SPECS: cairo-dock.spec - pl, cleanup, missing ldconfig call - adde...

qboosh qboosh at pld-linux.org
Sun Jan 6 23:04:53 CET 2008 

Author: qboosh                       Date: Sun Jan  6 22:04:53 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- pl, cleanup, missing ldconfig call
- added -devel

---- Files affected:
SPECS:
   cairo-dock.spec (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SPECS/cairo-dock.spec
diff -u SPECS/cairo-dock.spec:1.2 SPECS/cairo-dock.spec:1.3
--- SPECS/cairo-dock.spec:1.2	Mon Dec 17 22:49:29 2007
+++ SPECS/cairo-dock.spec	Sun Jan  6 23:04:47 2008
@@ -1,10 +1,10 @@
 # $Revision$, $Date$
-#
 Summary:	MacOS-like Dock for GNOME
+Summary(pl.UTF-8):	Dok w stylu MacOS dla GNOME
 Name:		cairo-dock
 Version:	1.4.5.1
-Release:	1
-License:	GPLv3+
+Release:	0.1
+License:	GPL v3+
 Group:		Applications
 Source0:	http://download.berlios.de/cairo-dock/%{name}-sources-20071214.tar.bz2
 # Source0-md5:	5c826e7bb4ac15dc398e59d7f698d1e3
@@ -12,41 +12,57 @@
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	cairo-devel
-#BuildRequires:	intltool
+BuildRequires:	dbus-glib
+BuildRequires:	gnome-vfs2-devel >= 2.0
+BuildRequires:	gtk+2-devel >= 1:2.0
+BuildRequires:	libgnomeui-devel >= 2.0
+BuildRequires:	librsvg-devel >= 2.0
 BuildRequires:	libtool
+BuildRequires:	pkgconfig
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 An light eye-candy fully themable animated dock for any Linux desktop.
-It has a family-likeness with OSX dock, but with more options.
+It has a family-likeness with MacOS X dock, but with more options.
+
+%description -l pl.UTF-8
+Jasny, miły dla oka, w pełni obsługujący motywy, animowany dok dla
+pulpitu linuksowego. Jest zbliżony do doka z MacOS X, ale ma więcej
+opcji.
+
+%package devel
+Summary:	Header files for cairo-dock plugins development
+Summary(pl.UTF-8):	Pliki nagłówkowe do tworzenia wtyczek cairo-docka
+Group:		Development/Libraries
+# probably doesn't require base
+
+%description devel
+Header files for cairo-dock plugins development.
+
+%description devel -l pl.UTF-8
+Pliki nagłówkowe do tworzenia wtyczek cairo-docka.
 
 %prep
-%setup -q -n opt/%{name}
+%setup -q -c
 
 %build
-# if ac/am/* rebuilding is necessary, do it in this order and add
-# appropriate BuildRequires
-#%%{__intltoolize}
-#%%{__gettextize}
-#%%{__libtoolize}
-#%%{__autoheader}
-# if not running libtool or automake, but config.sub is too old:
-#cp -f /usr/share/automake/config.sub .
-cd cairo-dock
+cd opt/cairo-dock
+DOCKDIR=$(pwd)
 %{__autoconf}
 %{__aclocal}
 %{__automake}
 %configure
 %{__make} -j1
-cd ..
 
-cd plug-ins
+cd ../plug-ins
+
 # To fix: logout
 for dir in clock file-manager rhythmbox dustbin file-manager-gnome rendering; do
 	cd $dir
 	PACKAGES="gtk+-2.0 cairo librsvg-2.0"
 	PACKAGE_LIBS=
-	PACKAGE_CFLAGS="-I$RPM_BUILD_DIR/opt/cairo-dock/cairo-dock/src"
+	# WTF ???
+	PACKAGE_CFLAGS="-I${DOCKDIR}/cairo-dock/src"
 	%{__autoconf}
 	%{__aclocal}
 	if [ $dir = rhythmbox ]; then
@@ -54,72 +70,61 @@
 		PACKAGES="$PACKAGES dbus-glib-1 dbus-1"
 	elif [ $dir = file-manager-gnome ]; then
 		PACKAGES="$PACKAGES gnome-vfs-2.0 libgnomeui-2.0"
-		PACKAGE_CFLAGS="$PACKAGE_CFLAGS -I$RPM_BUILD_DIR/opt/cairo-dock/plug-ins/file-manager/src"
+		PACKAGE_CFLAGS="$PACKAGE_CFLAGS -I${DOCKDIR}/plug-ins/file-manager/src"
 	elif [ $dir = rendering ]; then
 		%{__libtoolize}
 	fi
 	%{__automake}
-	PACKAGE_LIBS="$PACKAGE_LIBS `pkg-config --libs $PACKAGES`" PACKAGE_CFLAGS="$PACKAGE_CFLAGS `pkg-config --cflags $PACKAGES` " %configure
-	%{__make} -j1 pkgdatadir=/usr/share/cairo-dock/plug-in/$dir
+	PACKAGE_LIBS="$PACKAGE_LIBS `pkg-config --libs $PACKAGES`" \
+	PACKAGE_CFLAGS="$PACKAGE_CFLAGS `pkg-config --cflags $PACKAGES` " \
+	%configure
+	%{__make} -j1 \
+		pkgdatadir=/usr/share/cairo-dock/plug-in/$dir
 	cd ..
 done
-cd ..
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-cd cairo-dock
-%{__make} install \
+%{__make} -C opt/cairo-dock install \
 	DESTDIR=$RPM_BUILD_ROOT
-cd ..
 
-cd plug-ins
 # To fix: logout
 for dir in clock file-manager rhythmbox dustbin file-manager-gnome rendering; do
-	cd $dir
-	%{__make} install \
+	%{__make} -C opt/plug-ins/$dir install \
 		DESTDIR=$RPM_BUILD_ROOT \
 		pkgdatadir=/usr/share/cairo-dock/plug-in/$dir
-	cd ..
 done
-cd ..
+
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post	-p /sbin/ldconfig
+%postun	-p /sbin/ldconfig
+
 %files
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/cairo-dock
-
-#%files devel
-%{_includedir}/cairo-dock
-%{_includedir}/file-manager
-%{_libdir}/libcd-clock.so
-%attr(755,root,root)    %{_libdir}/libcd-clock.so.1
-%attr(755,root,root)    %{_libdir}/libcd-clock.so.1.0.0
-%{_libdir}/libcd-dustbin.la
-%{_libdir}/libcd-dustbin.so
-%attr(755,root,root)    %{_libdir}/libcd-dustbin.so.1
-%attr(755,root,root)    %{_libdir}/libcd-dustbin.so.1.0.0
-%{_libdir}/libcd-rendering.la
-%{_libdir}/libcd-rendering.so
-%attr(755,root,root)    %{_libdir}/libcd-rendering.so.1
-%attr(755,root,root)    %{_libdir}/libcd-rendering.so.1.0.0
-%{_libdir}/libcd-rhythmbox.la
-%{_libdir}/libcd-rhythmbox.so
-%attr(755,root,root)    %{_libdir}/libcd-rhythmbox.so.1
-%attr(755,root,root)    %{_libdir}/libcd-rhythmbox.so.1.0.0
-%{_libdir}/libfile-manager-gnome.la
-%{_libdir}/libfile-manager-gnome.so
-%attr(755,root,root)    %{_libdir}/libfile-manager-gnome.so.1
-%attr(755,root,root)    %{_libdir}/libfile-manager-gnome.so.1.0.0
-%{_libdir}/libfile-manager.la
-%{_libdir}/libfile-manager.so
-%attr(755,root,root)    %{_libdir}/libfile-manager.so.1
-%attr(755,root,root)    %{_libdir}/libfile-manager.so.1.0.0
-%{_pkgconfigdir}/cairo-dock.pc
-%{_pkgconfigdir}/file-manager.pc
-
+%attr(755,root,root) %{_libdir}/libcd-clock.so.1.0.0
+%attr(755,root,root) %ghost %{_libdir}/libcd-clock.so.1
+%attr(755,root,root) %{_libdir}/libcd-clock.so
+%attr(755,root,root) %{_libdir}/libcd-dustbin.so.1.0.0
+%attr(755,root,root) %ghost %{_libdir}/libcd-dustbin.so.1
+%attr(755,root,root) %{_libdir}/libcd-dustbin.so
+%attr(755,root,root) %{_libdir}/libcd-rendering.so.1.0.0
+%attr(755,root,root) %ghost %{_libdir}/libcd-rendering.so.1
+%attr(755,root,root) %{_libdir}/libcd-rendering.so
+%attr(755,root,root) %{_libdir}/libcd-rhythmbox.so.1.0.0
+%attr(755,root,root) %ghost %{_libdir}/libcd-rhythmbox.so.1
+%attr(755,root,root) %{_libdir}/libcd-rhythmbox.so
+%attr(755,root,root) %{_libdir}/libfile-manager-gnome.so.1.0.0
+%attr(755,root,root) %ghost %{_libdir}/libfile-manager-gnome.so.1
+%attr(755,root,root) %{_libdir}/libfile-manager-gnome.so
+%attr(755,root,root) %{_libdir}/libfile-manager.so.1.0.0
+%attr(755,root,root) %ghost %{_libdir}/libfile-manager.so.1
+%attr(755,root,root) %{_libdir}/libfile-manager.so
 %dir %{_datadir}/cairo-dock
 %{_datadir}/cairo-dock/*.svg
 %{_datadir}/cairo-dock/*.conf
@@ -128,16 +133,26 @@
 %{_datadir}/cairo-dock/*.conf
 %{_datadir}/cairo-dock/themes
 
+%files devel
+%defattr(644,root,root,755)
+%{_includedir}/cairo-dock
+%{_includedir}/file-manager
+%{_pkgconfigdir}/cairo-dock.pc
+%{_pkgconfigdir}/file-manager.pc
+
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2008-01-06 22:04:47  qboosh
+- pl, cleanup, missing ldconfig call
+- added -devel
+
 Revision 1.2  2007-12-17 21:49:29  wolf
 - make -j1
 
 Revision 1.1  2007-12-17 08:41:48  aredridel
 - added
 - NFY, needs -devel
-
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/cairo-dock.spec?r1=1.2&r2=1.3&f=u

More information about the pld-cvs-commit mailing list