--- a/ChangeLog Wed Jul 13 20:09:15 2011 +0000
+++ b/ChangeLog Wed Jul 13 20:56:21 2011 +0000
@@ -1,6 +1,7 @@
2011-07-13 Milan Jurik <[email protected]>
* SFEcairo-dock.spec: bump to 2.3.0~3
+ * SFEcairo-dock-plugins.spec: bump to 2.3.0~3
2010-07-12 Brian Cameron <[email protected]>
--- a/SFEcairo-dock-plugins.spec Wed Jul 13 20:09:15 2011 +0000
+++ b/SFEcairo-dock-plugins.spec Wed Jul 13 20:56:21 2011 +0000
@@ -10,15 +10,15 @@
%include base.inc
%define src_name cairo-dock-plugins
-%define ver_major 2.2.0
-%define ver_minor 4
+%define ver_major 2.3.0
+%define ver_minor 3
%define SUNWlibxklavier %(/usr/bin/pkginfo -q SUNWlibxklavier && echo 1 || echo 0)
Name: SFEcairo-dock-plugins
Summary: cairo-dock plugins
Version: %{ver_major}.%{ver_minor}
-Source: http://launchpad.net/cairo-dock-plug-ins/2.2/%{ver_major}/+download/%{src_name}-%{ver_major}-%{ver_minor}.tar.gz
+Source: http://launchpad.net/cairo-dock-plug-ins/2.3/%{ver_major}/+download/%{src_name}-%{ver_major}~%{ver_minor}.tar.gz
Patch1: cairo-dock-plugins-01-cmake.diff
Patch2: cairo-dock-plugins-02-solaris.diff
SUNW_BaseDir: %{_basedir}
@@ -46,6 +46,8 @@
BuildRequires: SFElibetpan-devel
Requires: SUNWlibexif
BuildRequires: SUNWlibexif-devel
+Requires: SUNWvala
+BuildRequires: SUNWvala-devel
Requires: SFEwebkitgtk
BuildRequires: SFEwebkitgtk-devel
@@ -59,7 +61,7 @@
%endif
%prep
-%setup -q -n %{src_name}-%{ver_major}-%{ver_minor}
+%setup -q -n %{src_name}-%{ver_major}~%{ver_minor}
%patch1 -p1
%patch2 -p1
@@ -101,6 +103,7 @@
%{_libdir}
%dir %attr(0755, root, sys) %{_datadir}
%{_datadir}/cairo-dock
+%{_datadir}/vala-0.10
%if %build_l10n
%files l10n
@@ -110,6 +113,8 @@
%endif
%changelog
+* Wed Jul 13 2011 - Milan Jurik
+- update to 2.3.0-3
* Wed May 11 2011 - Alex Viskovatoff
- Disable alsa-mixer plugin, which breaks the build
* Mon Feb 21 2011 - Milan Jurik
--- a/patches/cairo-dock-plugins-01-cmake.diff Wed Jul 13 20:09:15 2011 +0000
+++ b/patches/cairo-dock-plugins-01-cmake.diff Wed Jul 13 20:56:21 2011 +0000
@@ -1,11 +1,5 @@
---- cairo-dock-plugins-2.2.0-4/CMakeLists.txt 2010-10-02 00:42:14.000000000 +0200
-+++ cairo-dock-plugins-2.2.0-4-patch/CMakeLists.txt 2011-02-20 16:48:42.822850929 +0100
-@@ -12,7 +12,7 @@
- project ("cairo-dock-plugins")
- set (VERSION "2.2.0-4")
-
+--- cairo-dock-plugins-2.3.0~3/CMakeLists.txt 2011-07-13 21:41:32.349664141 +0200
++++ cairo-dock-plugins-2.3.0~3-patch/CMakeLists.txt 2011-07-13 21:43:37.367607172 +0200
+@@ -15 +15 @@
-add_definitions (-std=c99 -Wstrict-prototypes -Wextra -Wwrite-strings -Wuninitialized -Werror-implicit-function-declaration) #-Wunreachable-code -Wno-unused-parameter -Wall
+add_definitions (-std=c99)
- if (NOT ${CMAKE_BUILD_TYPE})
- add_definitions (-O3)
- endif()
--- a/patches/cairo-dock-plugins-02-solaris.diff Wed Jul 13 20:09:15 2011 +0000
+++ b/patches/cairo-dock-plugins-02-solaris.diff Wed Jul 13 20:56:21 2011 +0000
@@ -24,8 +24,8 @@
add_definitions (-DMY_APPLET_SHARE_DATA_DIR="${maildatadir}")
add_definitions (-DMY_APPLET_PREVIEW_FILE="preview.jpg")
add_definitions (-DMY_APPLET_CONF_FILE="mail.conf")
---- cairo-dock-plugins-2.2.0-4/shortcuts/src/applet-disk-usage.c 2010-10-02 00:42:16.000000000 +0200
-+++ cairo-dock-plugins-2.2.0-4-patch/shortcuts/src/applet-disk-usage.c 2011-02-20 17:33:12.715264925 +0100
+--- cairo-dock-plugins-2.3.0~3/shortcuts/src/applet-disk-usage.c Sun Jun 19 01:27:28 2011
++++ applet-disk-usage.c Wed Jul 13 21:51:53 2011
@@ -17,11 +17,12 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
@@ -42,14 +42,13 @@
#include <math.h>
#include <cairo-dock.h>
-@@ -32,14 +33,12 @@
+@@ -32,13 +33,11 @@
void cd_shortcuts_get_fs_stat (const gchar *cDiskURI, CDDiskUsage *pDiskUsage)
{
- static struct statfs sts;
+ static struct statvfs sts;
const gchar *cMountPath = (strncmp (cDiskURI, "file://", 7) == 0 ? cDiskURI + 7 : cDiskURI);
- //g_print ("checking device on '%s'...\n", cMountPath);
- if (statfs (cMountPath, &sts) == 0)
+ if (statvfs (cMountPath, &sts) == 0)
@@ -59,7 +58,7 @@
pDiskUsage->iAvail = (long long)sts.f_bavail * sts.f_bsize; // Blocs libres pour utilisateurs
pDiskUsage->iFree = (long long)sts.f_bfree * sts.f_bsize; // Blocs libres
pDiskUsage->iTotal = (long long)sts.f_blocks * sts.f_bsize; // Nombre total de blocs
-@@ -160,8 +159,8 @@
+@@ -153,8 +152,8 @@
static void _cd_shortcuts_get_fs_info (const gchar *cDiskURI, GString *sInfo)
{
const gchar *cMountPath = (strncmp (cDiskURI, "file://", 7) == 0 ? cDiskURI + 7 : cDiskURI);
@@ -70,7 +69,7 @@
char *search_path;
int match;
char *slash;
-@@ -173,22 +172,20 @@
+@@ -166,22 +165,20 @@
}
gchar *cFsInfo = NULL;