diff --git a/.cvsignore b/.cvsignore index 8cea8d6..024c781 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1 @@ -cairo-dock-1.6.2.3.tar.bz2 -cairo-dock-plugins-1.6.2.3.tar.bz2 -cairo-dock-themes-1.6.2.3.tar.bz2 +cairo-dock-sources-svn1315_trunk.tar.bz2 diff --git a/cairo-dock-plugin-rev1235.diff b/cairo-dock-plugin-rev1235.diff deleted file mode 100644 index 3a237b7..0000000 --- a/cairo-dock-plugin-rev1235.diff +++ /dev/null @@ -1,102 +0,0 @@ -Index: gauge-test/src/applet-init.c -=================================================================== ---- gauge-test/src/applet-init.c (revision 1235) -+++ gauge-test/src/applet-init.c (working copy) -@@ -18,7 +18,7 @@ - CD_APPLET_DEFINITION ("gauge-test", 1, 5, 4, CAIRO_DOCK_CATEGORY_ACCESSORY) - - --CD_APPLET_INIT_BEGIN (erreur) -+CD_APPLET_INIT_BEGIN - CD_APPLET_REGISTER_FOR_MIDDLE_CLICK_EVENT - CD_APPLET_REGISTER_FOR_CLICK_EVENT - CD_APPLET_REGISTER_FOR_BUILD_MENU_EVENT -Index: gauge-test/src/applet-struct.h -=================================================================== ---- gauge-test/src/applet-struct.h (revision 1235) -+++ gauge-test/src/applet-struct.h (working copy) -@@ -4,14 +4,14 @@ - - #include - --typedef struct { -+struct _AppletConfig { - gchar *cThemePath; -- } AppletConfig; -+ } ; - --typedef struct { -+struct _AppletData { - double gaugeValue; - Gauge *pGauge; -- } AppletData; -+ } ; - - - #endif -Index: musicplayer/src/musicplayer-init.c -=================================================================== ---- musicplayer/src/musicplayer-init.c (revision 1235) -+++ musicplayer/src/musicplayer-init.c (working copy) -@@ -28,7 +28,7 @@ - - - --CD_APPLET_INIT_BEGIN (erreur) -+CD_APPLET_INIT_BEGIN - if (myDesklet) - { - CD_APPLET_SET_DESKLET_RENDERER ("Simple"); -Index: musicplayer/src/musicplayer-struct.h -=================================================================== ---- musicplayer/src/musicplayer-struct.h (revision 1235) -+++ musicplayer/src/musicplayer-struct.h (working copy) -@@ -32,7 +32,7 @@ - PLAYER_NB_STATUS - } MyAppletPlayerStatus; - --typedef struct { -+struct _AppletConfig { - gboolean enableDialogs; - gboolean enableCover; - gdouble timeDialogs; -@@ -42,7 +42,7 @@ - gchar *defaultTitle; - gchar *cUserImage[PLAYER_NB_STATUS]; - gboolean bStealTaskBarIcon; -- } AppletConfig; -+ } ; - - typedef struct { - gchar *service; -@@ -64,7 +64,7 @@ - gchar *toggle; - } AppletDBus; - --typedef struct { -+struct _AppletData { - cairo_surface_t *pSurfaces[PLAYER_NB_STATUS]; - cairo_surface_t *pCover; - gchar *run_program; -@@ -89,7 +89,7 @@ - gchar *full_data; - guint iSidCheckCover; - AppletDBus DBus_commands; -- } AppletData; -+ } ; - - - -Index: weblets/src/applet-widget-itf.cpp -=================================================================== ---- weblets/src/applet-widget-itf.cpp (revision 1235) -+++ weblets/src/applet-widget-itf.cpp (working copy) -@@ -35,7 +35,7 @@ - #include - #include - #include --#include -+#include - #include - #include - diff --git a/cairo-dock-plugin-rev1241.diff b/cairo-dock-plugin-rev1241.diff deleted file mode 100644 index 5f341a5..0000000 --- a/cairo-dock-plugin-rev1241.diff +++ /dev/null @@ -1,66 +0,0 @@ -Index: plug-ins/musicplayer/src/musicplayer-init.c -=================================================================== ---- plug-ins/musicplayer/src/musicplayer-init.c (revision 1241) -+++ plug-ins/musicplayer/src/musicplayer-init.c (working copy) -@@ -28,7 +28,7 @@ - - - --CD_APPLET_INIT_BEGIN (erreur) -+CD_APPLET_INIT_BEGIN - if (myDesklet) - { - CD_APPLET_SET_DESKLET_RENDERER ("Simple"); -Index: plug-ins/musicplayer/src/musicplayer-struct.h -=================================================================== ---- plug-ins/musicplayer/src/musicplayer-struct.h (revision 1241) -+++ plug-ins/musicplayer/src/musicplayer-struct.h (working copy) -@@ -32,7 +32,7 @@ - PLAYER_NB_STATUS - } MyAppletPlayerStatus; - --typedef struct { -+struct _AppletConfig { - gboolean enableDialogs; - gboolean enableCover; - gdouble timeDialogs; -@@ -42,7 +42,7 @@ - gchar *defaultTitle; - gchar *cUserImage[PLAYER_NB_STATUS]; - gboolean bStealTaskBarIcon; -- } AppletConfig; -+ } ; - - typedef struct { - gchar *service; -@@ -64,7 +64,7 @@ - gchar *toggle; - } AppletDBus; - --typedef struct { -+struct _AppletData { - cairo_surface_t *pSurfaces[PLAYER_NB_STATUS]; - cairo_surface_t *pCover; - gchar *run_program; -@@ -89,7 +89,7 @@ - gchar *full_data; - guint iSidCheckCover; - AppletDBus DBus_commands; -- } AppletData; -+ } ; - - - -Index: plug-ins/weblets/src/applet-widget-itf.cpp -=================================================================== ---- plug-ins/weblets/src/applet-widget-itf.cpp (revision 1241) -+++ plug-ins/weblets/src/applet-widget-itf.cpp (working copy) -@@ -35,7 +35,7 @@ - #include - #include - #include --#include -+#include - #include - #include - diff --git a/cairo-dock.spec b/cairo-dock.spec index cdfa247..dcb63da 100644 --- a/cairo-dock.spec +++ b/cairo-dock.spec @@ -3,18 +3,18 @@ # cd trunk # tar cjf ../cairo-dock-sources-%%{tag}.tar.bz2 . -%define released 1 +%define released 0 # For now build only stable plugin %define build_other 1 -%define tarballver svn1276_trunk -%define mainver 1.6.2.3 +%define tarballver svn1315_trunk +%define mainver 1.6.3 %undefine betaver %define build_gecko 1 %if 0%{?released} < 1 -%define fedora_rel 0.4.%{tarballver} +%define fedora_rel 0.1.%{tarballver} %else %define fedora_rel 1%{?betaver:.%betaver} %endif @@ -47,16 +47,13 @@ URL: http://www.cairo-dock.org/ %if 0%{?released} < 1 Source0: %{name}-sources-%{tarballver}.tar.bz2 %else -# Source tarball changed again !! Source0: http://download.berlios.de/cairo-dock/%{name}-%{mainver}%{?betaver:-%betaver}.tar.bz2 Source1: http://download.berlios.de/cairo-dock/%{name}-themes-%{mainver}%{?betaver:-%betaver}.tar.bz2 Source2: http://download.berlios.de/cairo-dock/%{name}-plugins-%{mainver}%{?betaver:-%betaver}.tar.bz2 %endif -#Patch0: cairo-dock-rev1235-inf-loop.patch %if 0%{?released} < 1 Patch1: cairo-dock-plugin-rev1241.diff %endif -#Patch2: cairo-dock-svn1260-suppress-debug-message.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: automake @@ -223,49 +220,19 @@ cd ../plug-ins find . -name \*.h -or -name \*.c | xargs %{__chmod} 0644 # source code fix -%if 0%{?released} < 1 -%patch1 -p1 -b .misc -#%%patch2 -p0 -b .debug -%endif # mail: license conflict %{__rm} -rf mail/ -# musicplayer -%if 0%{?released} < 1 -cd musicplayer/ -sed -i.po -e '\|po/Makefile|d' configure.ac -sed -i -e '/ALL_LINGUAS/d' configure.ac -sed -i -e '/GETTEXT/d' configure.ac -sed -i -e '/INTLTOOL/d' configure.ac -sed -i.lib \ - -e '/AC_SUBST(pkgdatadir)/s|^\(.*\)$|\1\nlibdir=[`pkg-config cairo-dock --variable=pluginsdir`]\nAC_SUBST(libdir)|' \ - configure.ac -sed -i.po -e 's|po||' Makefile.am -cd .. -%endif - -# stack: not available on rev 1226 -# Available on 1.6.2 RC2 -%if 0%{?released} < 1 -rm -rf stack -%endif +# Clipper +sed -i.typo \ + -e 's|@GETTEXT_PACKAGE@|@GETTEXT_CLIPPER@|' \ + Clipper/po/Makefile.in.in # stacks: directory fix %if 0%{?released} < 1 sed -i.dir -e '/stacksdatadir/s|pluginsdir|pluginsdatadir|' \ stacks/configure.ac -sed -i.typo \ - -e 's|stack/|stacks/|' \ - -e 's|stackdata|stacksdata|' \ - -e 's|stack\.conf|stacks\.conf|' \ - -e 's|stack"|stacks"|' \ - configure.ac -sed -i.typo \ - -e 's|stack\\|stacks\\|' \ - Makefile.am -%else -# STACK vs STACKS typo fixed in 1.6.2.2 %endif # template: upstream says this is not needed @@ -321,7 +288,6 @@ for dir in */ if [ $skip == 2 ] ; then continue ; fi cd $dir -# typos in stack/ directory now fixed in 1.6.2.2 %{__sed} -i.error \ -e 's|-O3|-O2|' \ -e 's|-Werror\\|\\|' \ @@ -645,6 +611,9 @@ popd # from $RPM_BUILD_ROOT %{_libdir}/pkgconfig/*.pc %changelog +* Sun Sep 21 2008 Mamoru Tasaka +- rev 1315 + * Tue Sep 9 2008 Mamoru Tasaka - 1.6.2.3-1 - 1.6.2.3 diff --git a/sources b/sources index 4b0116a..1a37cf0 100644 --- a/sources +++ b/sources @@ -1,3 +1 @@ -15cfd709185dd9e3e94b981c51ae75a9 cairo-dock-1.6.2.3.tar.bz2 -afdab8b9778e25ead564b955caf57bdd cairo-dock-plugins-1.6.2.3.tar.bz2 -09ff25bc173cbb50ae66b3ab4f1a52c5 cairo-dock-themes-1.6.2.3.tar.bz2 +706508783a1e04116df01948c1b62998 cairo-dock-sources-svn1315_trunk.tar.bz2