diff --git a/Makefile.am b/Makefile.am
index ac5910d66b75ec4522d8c4f6a4eda0e157a38d47..b878e1d14ee3a3bc912e6e9232fb902a8dcb4315 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-@SET_MAKE@
+# $Id$
EXTRA_DIST = \
intltool-extract.in \
@@ -14,13 +14,13 @@ EXTRA_DIST = \
README \
README.Kiosk \
README.Plugins \
- .indent.pro
+ .indent.pro \
+ xfce4-panel.spec
DISTCLEANFILES = \
intltool-extract \
intltool-merge \
- intltool-update \
- xfce4-panel.spec
+ intltool-update
# docs should be at the end to make sure the library is build before
# scanning it.
@@ -33,6 +33,10 @@ SUBDIRS = \
po \
docs
+AUTOMAKE_OPTIONS = \
+ 1.8 \
+ dist-bzip2
+
distclean-local:
rm -rf *.cache *~
@@ -40,8 +44,6 @@ rpm: dist
rpmbuild -ta $(PACKAGE)-$(VERSION).tar.gz
@rm -f $(PACKAGE)-$(VERSION).tar.gz
-dist-bz2: dist
- zcat $(PACKAGE)-$(VERSION).tar.gz | bzip2 --best -c > $(PACKAGE)-$(VERSION).tar.bz2
+DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
-distcheck-bz2: distcheck
- zcat $(PACKAGE)-$(VERSION).tar.gz | bzip2 --best -c > $(PACKAGE)-$(VERSION).tar.bz2
+# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
diff --git a/configure.ac b/configure.ac
index 8ed76720d638b9ef5263fe8acea11d1a35203196..69b0fb4626e4c3fd103b8a02a4c01861954f84da 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,12 +2,12 @@ dnl configure.ac
dnl
dnl xfce4 - panel for the Xfce Desktop environment
dnl
-dnl 2005 Jasper Huijsmans <jasper@xfce.org>
+dnl 2005-2006 Jasper Huijsmans <jasper@xfce.org>
dnl
dnl version info
m4_define([xfce4_panel_version],[4.3.90.1])
-m4_define([libxfce4panel_verinfo], [1:4:0])
+m4_define([libxfce4panel_verinfo], [2:0:1])
dnl init autoconf
AC_COPYRIGHT([Copyright (c) 2002-2006
@@ -56,9 +56,8 @@ XDT_CHECK_LIBX11_REQUIRE
XDT_CHECK_LIBSM
dnl Check for required packages
-dnl XDT_CHECK_PACKAGE([LIBXFCE4MCS_CLIENT], [libxfce4mcs-client-1.0], [4.2.0])
-XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.3.0])
-XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.3.6])
+XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.3.90.1])
+XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.3.90.1])
XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.6.0])
dnl Check for optional packages
@@ -70,9 +69,6 @@ XDT_CHECK_OPTIONAL_PACKAGE([LIBSTARTUP_NOTIFICATION],
dnl gtk-doc
GTK_DOC_CHECK([1.0])
-dnl Configure the mcs plugin
-dnl XDT_XFCE_MCS_PLUGIN([XFCE_MCS_MANAGER], [4.2.0])
-
dnl Check for debugging support
XDT_FEATURE_DEBUG()
diff --git a/icons/Makefile.am b/icons/Makefile.am
index d330893561846513998367fc0a1299148b3975d5..2c7e26838122659575f2e8c90921f4dbdd49bec9 100644
--- a/icons/Makefile.am
+++ b/icons/Makefile.am
@@ -1,3 +1,5 @@
+# $Id$
+
hicolor48dir = $(datadir)/icons/hicolor/48x48/apps
hicolor16dir = $(datadir)/icons/hicolor/16x16/apps
@@ -30,3 +32,17 @@ hicolor16_DATA = \
EXTRA_DIST = $(hicolor48_DATA) $(hicolor16_DATA)
+gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
+
+install-data-hook:
+ @-if test -z "$(DESTDIR)"; then \
+ echo "Updating Gtk icon cache."; \
+ $(gtk_update_icon_cache); \
+ else \
+ echo "*** Icon cache not updated. Remember to run:"; \
+ echo "***"; \
+ echo "*** $(gtk_update_icon_cache)"; \
+ echo "***"; \
+ fi
+
+# vi:set ts=8 sw=8 noet ai nocindent:
diff --git a/panel/panel.c b/panel/panel.c
index 6e7e047a57aff6276b21ef9457bf741cb66d06c8..2e62bb71c152e4bab31fd20891d165a54cd4ab8c 100644
--- a/panel/panel.c
+++ b/panel/panel.c
@@ -890,7 +890,7 @@ _panel_get_new_id (void)
static char id[30];
/* unique number: pseudo-random time() + counter */
- g_snprintf (id, 30, "%ld%d", time (NULL), counter++);
+ g_snprintf (id, 30, "%ld%d", (glong) time (NULL), counter++);
return id;
}
diff --git a/po/xfce4-panel.pot b/po/xfce4-panel.pot
index 357e492f48d1db00d596cfbfc3e779842f2f394e..b824c7234c2aac63f7951376136269cb6a783aea 100644
--- a/po/xfce4-panel.pot
+++ b/po/xfce4-panel.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-09 11:13+0900\n"
+"POT-Creation-Date: 2006-04-16 12:25+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -29,7 +29,7 @@ msgstr ""
#: ../libxfce4panel/xfce-panel-plugin-iface.c:575 ../panel/panel-app.c:734
#: ../panel/panel-app.c:766 ../panel/panel-app.c:799
-#: ../panel/panel-dialogs.c:579 ../panel/panel-dialogs.c:1590
+#: ../panel/panel-dialogs.c:579 ../panel/panel-dialogs.c:1594
#: ../plugins/launcher/launcher.c:412 ../plugins/launcher/launcher.c:438
#: ../plugins/launcher/launcher.c:474
msgid "Xfce Panel"
@@ -159,107 +159,107 @@ msgstr ""
msgid "Available Items"
msgstr ""
-#: ../panel/panel-dialogs.c:843 ../panel/panel-dialogs.c:1067
+#: ../panel/panel-dialogs.c:847 ../panel/panel-dialogs.c:1071
msgid "Normal Width"
msgstr ""
-#: ../panel/panel-dialogs.c:845 ../panel/panel-dialogs.c:1069
+#: ../panel/panel-dialogs.c:849 ../panel/panel-dialogs.c:1073
msgid "Full Width"
msgstr ""
-#: ../panel/panel-dialogs.c:851 ../panel/panel-dialogs.c:1075
+#: ../panel/panel-dialogs.c:855 ../panel/panel-dialogs.c:1079
msgid "Span Monitors"
msgstr ""
-#: ../panel/panel-dialogs.c:911 ../panel/panel-dialogs.c:1140
+#: ../panel/panel-dialogs.c:915 ../panel/panel-dialogs.c:1144
msgid "Left"
msgstr ""
-#: ../panel/panel-dialogs.c:913 ../panel/panel-dialogs.c:1142
+#: ../panel/panel-dialogs.c:917 ../panel/panel-dialogs.c:1146
msgid "Right"
msgstr ""
-#: ../panel/panel-dialogs.c:918 ../panel/panel-dialogs.c:1147
+#: ../panel/panel-dialogs.c:922 ../panel/panel-dialogs.c:1151
msgid "Top"
msgstr ""
-#: ../panel/panel-dialogs.c:920 ../panel/panel-dialogs.c:1149
+#: ../panel/panel-dialogs.c:924 ../panel/panel-dialogs.c:1153
msgid "Bottom"
msgstr ""
#. position
-#: ../panel/panel-dialogs.c:948
+#: ../panel/panel-dialogs.c:952
msgid "Position"
msgstr ""
-#: ../panel/panel-dialogs.c:962
+#: ../panel/panel-dialogs.c:966
msgid "Fixed Position"
msgstr ""
-#: ../panel/panel-dialogs.c:968
+#: ../panel/panel-dialogs.c:972
msgid "Freely Moveable"
msgstr ""
-#: ../panel/panel-dialogs.c:1083
+#: ../panel/panel-dialogs.c:1087
msgid "Auto_hide"
msgstr ""
-#: ../panel/panel-dialogs.c:1101
+#: ../panel/panel-dialogs.c:1105
msgid "Orientation:"
msgstr ""
-#: ../panel/panel-dialogs.c:1113
+#: ../panel/panel-dialogs.c:1117
msgid "Horizontal"
msgstr ""
-#: ../panel/panel-dialogs.c:1115
+#: ../panel/panel-dialogs.c:1119
msgid "Vertical"
msgstr ""
-#: ../panel/panel-dialogs.c:1124
+#: ../panel/panel-dialogs.c:1128
msgid "Handle:"
msgstr ""
-#: ../panel/panel-dialogs.c:1136
+#: ../panel/panel-dialogs.c:1140
msgid "At both sides"
msgstr ""
-#: ../panel/panel-dialogs.c:1217
+#: ../panel/panel-dialogs.c:1221
msgid "Select Monitor"
msgstr ""
-#: ../panel/panel-dialogs.c:1335 ../plugins/clock/clock.c:431
+#: ../panel/panel-dialogs.c:1339 ../plugins/clock/clock.c:431
msgid "Appearance"
msgstr ""
#. size
-#: ../panel/panel-dialogs.c:1346
+#: ../panel/panel-dialogs.c:1350
msgid "Size (pixels):"
msgstr ""
-#: ../panel/panel-dialogs.c:1369
+#: ../panel/panel-dialogs.c:1373
msgid "Transparency (%):"
msgstr ""
-#: ../panel/panel-dialogs.c:1393
+#: ../panel/panel-dialogs.c:1397
msgid "Make active panel opaque"
msgstr ""
-#: ../panel/panel-dialogs.c:1434 ../panel/panel-dialogs.c:1472
-#: ../panel/panel-dialogs.c:1497
+#: ../panel/panel-dialogs.c:1438 ../panel/panel-dialogs.c:1476
+#: ../panel/panel-dialogs.c:1501
#, c-format
msgid "Panel %d"
msgstr ""
-#: ../panel/panel-dialogs.c:1518
+#: ../panel/panel-dialogs.c:1522
msgid "Remove Panel"
msgstr ""
-#: ../panel/panel-dialogs.c:1531
+#: ../panel/panel-dialogs.c:1535
msgid "New Panel"
msgstr ""
-#: ../panel/panel-dialogs.c:1615
+#: ../panel/panel-dialogs.c:1619
msgid "Panel Manager"
msgstr ""
diff --git a/xfce4-panel.spec.in b/xfce4-panel.spec.in
index 5bbdea7927d531f219b2e7f5b7c34d9da4ab66e4..ff5e52bc88cdbfd0545ba67c96aaebf730b1b85e 100644
--- a/xfce4-panel.spec.in
+++ b/xfce4-panel.spec.in
@@ -1,22 +1,18 @@
Summary: Xfce Panel
-Name: xfce4-panel
-Version: @VERSION@
+Name: @PACKAGE_TARNAME@
+Version: @PACKAGE_VERSION@
Release: 1
License: GPL, LGPL
URL: http://www.xfce.org/
Source0: %{name}-%{version}.tar.gz
Group: User Interface/Desktops
BuildRoot: %{_tmppath}/%{name}-root
+Requires: libxfce4util >= @LIBXFCEGUI4_REQUIRED_VERSION@
Requires: libxfcegui4 >= @LIBXFCEGUI4_REQUIRED_VERSION@
-Requires: libxfce4mcs >= @LIBXFCE4MCS_CLIENT_REQUIRED_VERSION@
-Requires: xfce-mcs-manager >= @XFCE_MCS_MANAGER_REQUIRED_VERSION@
+BuildRequires: libxfce4util-devel >= @LIBXFCEGUI4_REQUIRED_VERSION@
BuildRequires: libxfcegui4-devel >= @LIBXFCEGUI4_REQUIRED_VERSION@
-BuildRequires: libxfce4mcs-devel >= @LIBXFCE4MCS_CLIENT_REQUIRED_VERSION@
-BuildRequires: xfce-mcs-manager-devel >= @XFCE_MCS_MANAGER_REQUIRED_VERSION@
-#Requires: gtk2 >= @GTK_REQUIRED_VERSION@
-#Requires: glib2 >= @GLIB_REQUIRED_VERSION@
-#BuildRequires: gtk2-devel >= @GTK_REQUIRED_VERSION@
-#BuildRequires: glib2-devel >= @GLIB_REQUIRED_VERSION@
+Requires: gtk2 >= @GTK_REQUIRED_VERSION@
+BuildRequires: gtk2-devel >= @GTK_REQUIRED_VERSION@
%description
xfce4-panel is the panel for the Xfce desktop environment
@@ -24,7 +20,7 @@ xfce4-panel is the panel for the Xfce desktop environment
%package devel
Summary: developpment headers for xfce4-panel
Group: User Interface/Desktops
-Requires: xfce4-panel >= @VERSION@
+Requires: xfce4-panel >= @PACKAGE_VERSION@
%description devel
Header files to build plugins for xfce4-panel.
@@ -33,7 +29,7 @@ Header files to build plugins for xfce4-panel.
%setup -q
%build
-%configure
+%configure --enable-final --enable-gtk-doc
make
%install
@@ -43,21 +39,36 @@ make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
%clean
rm -rf $RPM_BUILD_ROOT
+%post
+/sbin/ldconfig
+touch --no-create %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+ %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
+%postun
+/sbin/ldconfig
+touch --no-create %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+ %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
%files
%defattr(-,root,root)
%doc README README.Kiosk ChangeLog NEWS INSTALL COPYING COPYING_LIBS AUTHORS HACKING
-%{_sysconfdir}/xdg/xfce4/
-%{_datadir}/xfce4/doc/
+%config(noreplace) %{_sysconfdir}/xdg/xfce4/
+%{_datadir}/icons/
%{_datadir}/locale/
-%{_datadir}/applications
-%{_datadir}/icons
-%{_libdir}/xfce4/mcs-plugins/
-%{_libdir}/
+%{_datadir}/xfce4/
%{_bindir}/
+%{_libdir}/lib*.so.*
%{_libdir}/xfce4/panel-plugins/
%{_libexecdir}/xfce4/panel-plugins/
%files devel
%defattr(-, root, root)
-%{_libdir}/pkgconfig/
+%{_libdir}/lib*.so
+%{_libdir}/*a
+%{_libdir}/pkgconfig/*.pc
%{_includedir}/xfce4/
+%{_datadir}/gtk-doc/