Author: areq Date: Fri Aug 7 13:57:38 2009 GMT Module: packages Tag: HEAD ---- Log message: - start upgrade to 2.0.8
---- Files affected: packages/cairo-dock: cairo-dock.spec (1.6 -> 1.7) ---- Diffs: ================================================================ Index: packages/cairo-dock/cairo-dock.spec diff -u packages/cairo-dock/cairo-dock.spec:1.6 packages/cairo-dock/cairo-dock.spec:1.7 --- packages/cairo-dock/cairo-dock.spec:1.6 Sun Jan 6 23:35:23 2008 +++ packages/cairo-dock/cairo-dock.spec Fri Aug 7 15:57:33 2009 @@ -2,12 +2,12 @@ Summary: MacOS-like Dock for GNOME Summary(pl.UTF-8): Dok w stylu MacOS dla GNOME Name: cairo-dock -Version: 1.4.5.1 +Version: 2.0.8 Release: 0.1 License: GPL v3+ Group: Applications -Source0: http://download.berlios.de/cairo-dock/%{name}-sources-20071214.tar.bz2 -# Source0-md5: 5c826e7bb4ac15dc398e59d7f698d1e3 +Source0: http://download.berlios.de/cairo-dock/%{name}-%{version}.tar.bz2 +# Source0-md5: bf591fb0833c41c8d6dec327d847b681 URL: http://developer.berlios.de/projects/cairo-dock/ BuildRequires: autoconf >= 2.59 BuildRequires: automake @@ -15,6 +15,7 @@ BuildRequires: dbus-glib BuildRequires: glitz-devel BuildRequires: gnome-vfs2-devel >= 2.0 +BuildRequires: gtkglext-devel >= 1.2.0 BuildRequires: gtk+2-devel >= 1:2.0 BuildRequires: libgnomeui-devel >= 2.0 BuildRequires: librsvg-devel >= 2.0 @@ -48,61 +49,22 @@ Pliki nagłówkowe do tworzenia wtyczek cairo-docka. %prep -%setup -q -c +%setup -q %build -cd opt/cairo-dock DOCKDIR=$(pwd) -cd cairo-dock %{__autoconf} %{__aclocal} %{__automake} %configure %{__make} -j1 -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= - # WTF ??? - PACKAGE_CFLAGS="-I${DOCKDIR}/cairo-dock/src" - %{__autoconf} - %{__aclocal} - if [ $dir = rhythmbox ]; then - %{__libtoolize} - 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${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 \ - --disable-static - %{__make} -j1 \ - pkgdatadir=/usr/share/cairo-dock/plug-in/$dir - cd .. -done - %install rm -rf $RPM_BUILD_ROOT -%{__make} -C opt/cairo-dock/cairo-dock install \ +%{__make} install \ DESTDIR=$RPM_BUILD_ROOT -# To fix: logout -for dir in clock file-manager rhythmbox dustbin file-manager-gnome rendering; do - %{__make} -C opt/cairo-dock/plug-ins/$dir install \ - DESTDIR=$RPM_BUILD_ROOT \ - pkgdatadir=/usr/share/cairo-dock/plug-in/$dir -done - rm -f $RPM_BUILD_ROOT%{_libdir}/*.la %clean @@ -114,38 +76,16 @@ %files %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/cairo-dock -%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 -%{_datadir}/cairo-dock/plug-in -%{_datadir}/cairo-dock/readme-basic-view -%{_datadir}/cairo-dock/*.conf +%{_datadir}/cairo-dock +#%{_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 +%attr(755,root,root) %{_libdir}/libcairo-dock.so %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -153,6 +93,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.7 2009/08/07 13:57:33 areq +- start upgrade to 2.0.8 + Revision 1.6 2008/01/06 22:35:23 qboosh - disable-static ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cairo-dock/cairo-dock.spec?r1=1.6&r2=1.7&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
