- up to 0.6.2

diff --git a/ac-fix.patch b/ac-fix.patch
deleted file mode 100644 (file)
index 9fefac4..0000000
--- a/ac-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- xfce4-datetime-plugin-0.6.1/configure.in~  2012-05-18 13:39:15.675987388 +0200
-+++ xfce4-datetime-plugin-0.6.1/configure.in   2012-05-18 13:39:29.772654250 +0200
-@@ -37,9 +37,6 @@
- 
- #CFLAGS="$CFLAGS -Wall -Werror"
- 
--dnl Check for debugging support
--BM_DEBUG_SUPPORT()
--
- AC_OUTPUT([
- Makefile
- po/Makefile.in

diff --git a/xfce4-datetime-plugin-ui.patch b/xfce4-datetime-plugin-ui.patch
deleted file mode 100644 (file)
index ddf4a45..0000000
--- a/xfce4-datetime-plugin-ui.patch
+++ /dev/null
@@ -1,151 +0,0 @@
-diff -ur xfce4-datetime-plugin-0.6.1-orig/config.h.in xfce4-datetime-plugin-0.6.1/config.h.in
---- xfce4-datetime-plugin-0.6.1-orig/config.h.in       2008-11-19 08:10:47.000000000 +0100
-+++ xfce4-datetime-plugin-0.6.1/config.h.in    2011-03-01 12:45:13.000000000 +0100
-@@ -57,6 +57,10 @@
- /* Define to 1 if you have the <unistd.h> header file. */
- #undef HAVE_UNISTD_H
- 
-+/* Define to the sub-directory in which libtool stores uninstalled libraries.
-+   */
-+#undef LT_OBJDIR
-+
- /* Name of package */
- #undef PACKAGE
- 
-@@ -72,21 +76,39 @@
- /* Define to the one symbol short name of this package. */
- #undef PACKAGE_TARNAME
- 
-+/* Define to the home page for this package. */
-+#undef PACKAGE_URL
-+
- /* Define to the version of this package. */
- #undef PACKAGE_VERSION
- 
- /* Define to 1 if you have the ANSI C header files. */
- #undef STDC_HEADERS
- 
--/* Version number of package */
--#undef VERSION
--
--/* Define to 1 if on AIX 3.
--   System headers sometimes define this.
--   We just want to avoid a redefinition error message.  */
-+/* Enable extensions on AIX 3, Interix.  */
- #ifndef _ALL_SOURCE
- # undef _ALL_SOURCE
- #endif
-+/* Enable GNU extensions on systems that have them.  */
-+#ifndef _GNU_SOURCE
-+# undef _GNU_SOURCE
-+#endif
-+/* Enable threading extensions on Solaris.  */
-+#ifndef _POSIX_PTHREAD_SEMANTICS
-+# undef _POSIX_PTHREAD_SEMANTICS
-+#endif
-+/* Enable extensions on HP NonStop.  */
-+#ifndef _TANDEM_SOURCE
-+# undef _TANDEM_SOURCE
-+#endif
-+/* Enable general extensions on Solaris.  */
-+#ifndef __EXTENSIONS__
-+# undef __EXTENSIONS__
-+#endif
-+
-+
-+/* Version number of package */
-+#undef VERSION
- 
- /* Define to 1 if on MINIX. */
- #undef _MINIX
-diff -ur xfce4-datetime-plugin-0.6.1-orig/configure.in xfce4-datetime-plugin-0.6.1/configure.in
---- xfce4-datetime-plugin-0.6.1-orig/configure.in      2008-11-19 08:10:31.000000000 +0100
-+++ xfce4-datetime-plugin-0.6.1/configure.in   2011-03-01 12:45:09.698889237 +0100
-@@ -31,7 +31,7 @@
- 
- dnl Check for required packages
- XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.6.0])
--XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.3.99.2])
-+XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.8.0])
- XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.3.99.2])
- XDT_CHECK_PACKAGE([LIBXFCE4PANEL],[libxfce4panel-1.0],[4.3.99.2])
- 
-diff -ur xfce4-datetime-plugin-0.6.1-orig/panel-plugin/datetime.c xfce4-datetime-plugin-0.6.1/panel-plugin/datetime.c
---- xfce4-datetime-plugin-0.6.1-orig/panel-plugin/datetime.c   2008-10-25 19:07:51.000000000 +0200
-+++ xfce4-datetime-plugin-0.6.1/panel-plugin/datetime.c        2011-03-01 12:45:09.698889237 +0100
-@@ -28,10 +28,9 @@
- #include <string.h>
- 
- /* xfce includes */
--#include <libxfcegui4/libxfcegui4.h>
-+#include <libxfce4ui/libxfce4ui.h>
- #include <libxfce4util/libxfce4util.h>
--#include <libxfce4panel/xfce-panel-plugin.h>
--#include <libxfce4panel/xfce-panel-convenience.h>
-+#include <libxfce4panel/libxfce4panel.h>
- 
- #include "datetime.h"
- #include "datetime-dialog.h"
-diff -ur xfce4-datetime-plugin-0.6.1-orig/panel-plugin/datetime-dialog.c xfce4-datetime-plugin-0.6.1/panel-plugin/datetime-dialog.c
---- xfce4-datetime-plugin-0.6.1-orig/panel-plugin/datetime-dialog.c    2008-11-19 08:06:14.000000000 +0100
-+++ xfce4-datetime-plugin-0.6.1/panel-plugin/datetime-dialog.c 2011-03-01 12:47:56.425889238 +0100
-@@ -28,9 +28,9 @@
- #include <string.h>
- 
- /* xfce includes */
--#include <libxfcegui4/libxfcegui4.h>
-+#include <libxfce4ui/libxfce4ui.h>
- #include <libxfce4util/libxfce4util.h>
--#include <libxfce4panel/xfce-panel-plugin.h>
-+#include <libxfce4panel/libxfce4panel.h>
- 
- #include "datetime.h"
- #include "datetime-dialog.h"
-@@ -388,7 +388,7 @@
-   /*
-    * layout frame
-    */
--  frame = xfce_create_framebox(_("Layout"), &bin);
-+  frame = xfce_gtk_frame_box_new(_("Layout"), &bin);
-   gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dlg)->vbox), frame,
-       FALSE, FALSE, 0);
-   gtk_container_set_border_width(GTK_CONTAINER(frame), 6);
-@@ -422,7 +422,7 @@
-   /*
-    * Date frame
-    */
--  datetime->date_frame = xfce_create_framebox(_("Date"), &bin);
-+  datetime->date_frame = xfce_gtk_frame_box_new(_("Date"), &bin);
-   gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dlg)->vbox), datetime->date_frame,
-       FALSE, FALSE, 0);
-   gtk_container_set_border_width(GTK_CONTAINER(datetime->date_frame), 6);
-@@ -525,7 +525,7 @@
-   /*
-    * time frame
-    */
--  datetime->time_frame = xfce_create_framebox(_("Time"), &bin);
-+  datetime->time_frame = xfce_gtk_frame_box_new(_("Time"), &bin);
-   gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dlg)->vbox), datetime->time_frame,
-       FALSE, FALSE, 0);
-   gtk_container_set_border_width(GTK_CONTAINER(datetime->time_frame), 6);
-diff -ur xfce4-datetime-plugin-0.6.1-orig/panel-plugin/Makefile.am xfce4-datetime-plugin-0.6.1/panel-plugin/Makefile.am
---- xfce4-datetime-plugin-0.6.1-orig/panel-plugin/Makefile.am  2008-04-21 06:21:45.000000000 +0200
-+++ xfce4-datetime-plugin-0.6.1/panel-plugin/Makefile.am       2011-03-01 12:45:09.703889237 +0100
-@@ -14,7 +14,7 @@
-       -DLOCALEDIR=\"$(localedir)\"            \
-       $(GTK_CFLAGS)                           \
-       $(LIBXFCE4PANEL_CFLAGS)                 \
--      $(LIBXFCEGUI4_CFLAGS)                   \
-+      $(LIBXFCE4UI_CFLAGS)                    \
-       $(LIBXFCE4UTIL_CFLAGS)
- 
- libdatetime_la_LDFLAGS =                      \
-@@ -29,7 +29,7 @@
- libdatetime_la_LIBADD =                       \
-       $(GTK_LIBS)                             \
-       $(LIBXFCE4PANEL_LIBS)                   \
--      $(LIBXFCEGUI4_LIBS)                     \
-+      $(LIBXFCE4UI_LIBS)                      \
-       $(LIBXFCE4UTIL_LIBS)
- 
- desktopdir = $(datadir)/xfce4/panel-plugins

diff --git a/xfce4-datetime-plugin.spec b/xfce4-datetime-plugin.spec
index 294042270c16f677ce4e422ce1aa3a2fc557cd67..c0a1bab388ab1c0513a6dd1bc7eabe529692ad4a 100644 (file)
--- a/xfce4-datetime-plugin.spec
+++ b/xfce4-datetime-plugin.spec
@@ -1,14 +1,12 @@
 Summary:       A date and time plugin for the Xfce panel
 Summary(pl.UTF-8):     Wtyczka panelu Xfce pokazująca datę i czas
 Name:          xfce4-datetime-plugin
-Version:       0.6.1
-Release:       5
+Version:       0.6.2
+Release:       1
 License:       GPL v2
 Group:         X11/Applications
-Source0:       http://goodies.xfce.org/releases/xfce4-datetime-plugin/%{name}-%{version}.tar.bz2
-# Source0-md5: e82f51ff0e75a63e5cbd139e43e094f9
-Patch0:                %{name}-ui.patch
-Patch1:                ac-fix.patch
+Source0:       http://archive.xfce.org/src/panel-plugins/xfce4-datetime-plugin/0.6/%{name}-%{version}.tar.bz2
+# Source0-md5: fe604a251eadbc5b0f2b4737b85d92c8
 URL:           http://goodies.xfce.org/projects/panel-plugins/xfce4-datetime-plugin
 BuildRequires: autoconf
 BuildRequires: automake
@@ -30,8 +28,6 @@ kalendarz.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 
 %build
 %{__intltoolize}
@@ -50,9 +46,7 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-mv $RPM_BUILD_ROOT%{_datadir}/locale/pt{_PT,}
-
-rm -f $RPM_BUILD_ROOT%{_libdir}/xfce4/panel-plugins/*.la
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/xfce4/panel/plugins/*.la
 
 %find_lang %{name}
 
@@ -62,5 +56,5 @@ rm -rf $RPM_BUILD_ROOT
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog README
-%attr(755,root,root) %{_libdir}/xfce4/panel-plugins/libdatetime.so
-%{_datadir}/xfce4/panel-plugins/datetime.desktop
+%attr(755,root,root) %{_libdir}/xfce4/panel/plugins/libdatetime.so
+%{_datadir}/xfce4/panel/plugins/datetime.desktop