Author: baggins Date: Sun Nov 14 12:28:23 2010 GMT
Module: packages Tag: DEVEL
---- Log message:
- 4.7.2, XFCE 4.8pre1
---- Files affected:
packages/xfdesktop:
xfdesktop-generic-menu.patch (1.1 -> 1.1.2.1) , xfdesktop.spec (1.84 ->
1.84.2.1)
---- Diffs:
================================================================
Index: packages/xfdesktop/xfdesktop-generic-menu.patch
diff -u packages/xfdesktop/xfdesktop-generic-menu.patch:1.1
packages/xfdesktop/xfdesktop-generic-menu.patch:1.1.2.1
--- packages/xfdesktop/xfdesktop-generic-menu.patch:1.1 Sun May 16 20:22:02 2010
+++ packages/xfdesktop/xfdesktop-generic-menu.patch Sun Nov 14 13:28:17 2010
@@ -1,5 +1,5 @@
---- xfdesktop-4.6.1/common/desktop-menu-utils.c~ 2009-01-12
23:03:12.000000000 +0100
-+++ xfdesktop-4.6.1/common/desktop-menu-utils.c 2010-05-16
20:19:02.820729427 +0200
+--- xfdesktop-4.6.1/src/xfce-desktop-menu.c~ 2009-01-12 23:03:12.000000000
+0100
++++ xfdesktop-4.6.1/src/xfce-desktop-menu.c 2010-05-16 20:19:02.820729427
+0200
@@ -56,6 +56,22 @@
}
================================================================
Index: packages/xfdesktop/xfdesktop.spec
diff -u packages/xfdesktop/xfdesktop.spec:1.84
packages/xfdesktop/xfdesktop.spec:1.84.2.1
--- packages/xfdesktop/xfdesktop.spec:1.84 Thu Nov 11 22:04:33 2010
+++ packages/xfdesktop/xfdesktop.spec Sun Nov 14 13:28:17 2010
@@ -2,35 +2,40 @@
Summary: Desktop manager for the Xfce Desktop Environment
Summary(pl.UTF-8): Zarządca pulpitu dla środowiska Xfce
Name: xfdesktop
-Version: 4.6.1
-Release: 6
+Version: 4.7.2
+Release: 0.1
License: GPL v2
Group: X11/Applications
-Source0:
http://www.xfce.org/archive/xfce-%{version}/src/%{name}-%{version}.tar.bz2
-# Source0-md5: ae15cacc3e3834cca7238a8e1035c50d
+Source0:
http://www.xfce.org/archive/xfce/4.8pre1/src/%{name}-%{version}.tar.bz2
+# Source0-md5: 88d10a7775f65a007639f921c5c8f13a
Patch0: %{name}-generic-menu.patch
URL: http://www.xfce.org/projects/xfdesktop/
BuildRequires: Thunar-devel >= 1.0.0
BuildRequires: autoconf >= 2.50
BuildRequires: automake
-BuildRequires: exo-devel >= 0.3.100
+BuildRequires: exo-devel >= 0.5.4
+BuildRequires: garcon-devel >= 0.1.3
BuildRequires: gettext-devel
BuildRequires: gtk+2-devel >= 2:2.10.6
BuildRequires: intltool >= 0.35.0
BuildRequires: libglade2-devel
BuildRequires: libtool
BuildRequires: libwnck-devel >= 2.12.0
-BuildRequires: libxfce4menu-devel >= %{version}
-BuildRequires: libxfcegui4-devel >= %{version}
+#BuildRequires: libxfce4ui-devel >= %{version}
+BuildRequires: libxfce4ui-devel >= 4.7.0
BuildRequires: pkgconfig >= 1:0.9.0
BuildRequires: rpmbuild(macros) >= 1.311
BuildRequires: xfce4-dev-tools >= 4.6.0
-BuildRequires: xfce4-panel-devel >= %{version}
-BuildRequires: xfconf-devel >= %{version}
+#BuildRequires: xfce4-panel-devel >= %{version}
+#BuildRequires: xfconf-devel >= %{version}
+BuildRequires: xfce4-panel-devel >= 4.7.0
+BuildRequires: xfconf-devel >= 4.7.0
Requires(post,postun): gtk+2
Requires(post,postun): hicolor-icon-theme
+Requires: garcon >= 0.1.2
Requires: xfce4-dirs >= 4.6
-Requires: xfce4-panel >= %{version}
+#Requires: xfce4-panel >= %{version}
+Requires: xfce4-panel >= 4.7.0
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -44,18 +49,11 @@
%patch0 -p1
%build
-%{__glib_gettextize}
-%{__aclocal}
-%{__intltoolize}
-%{__autoheader}
-%{__automake}
-%{__aclocal}
%configure \
--enable-desktop-icons \
--enable-desktop-menu \
--enable-exo \
--enable-file-icons \
- --enable-panel-plugin \
--enable-thunarx
%{__make}
@@ -66,8 +64,6 @@
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT%{_libdir}/xfce4/{panel-plugins,modules}/*.{la,a}
-
%find_lang %{name}
%clean
@@ -82,13 +78,10 @@
%files -f %{name}.lang
%defattr(644,root,root,755)
%doc AUTHORS ChangeLog README TODO
-%attr(755,root,root) %{_bindir}/xfce4-popup-menu
%attr(755,root,root) %{_bindir}/xfdesktop
%attr(755,root,root) %{_bindir}/xfdesktop-settings
-%dir %{_libdir}/xfce4/modules
-%attr(755,root,root) %{_libdir}/xfce4/modules/xfce4_desktop_menu.so
-%attr(755,root,root) %{_libdir}/xfce4/panel-plugins/xfce4-menu-plugin
+%if 0
%{_datadir}/xfce4/doc/C/*.html
%{_datadir}/xfce4/doc/C/images/*.png
%lang(da) %{_datadir}/xfce4/doc/da/*.html
@@ -98,13 +91,11 @@
%lang(it) %{_datadir}/xfce4/doc/it/images/*.png
%lang(ja) %{_datadir}/xfce4/doc/ja/*.html
%lang(ja) %{_datadir}/xfce4/doc/ja/images/*.png
+%endif
%{_mandir}/man1/*.1*
-%{_sysconfdir}/xdg/menus
%{_desktopdir}/*.desktop
-%{_datadir}/desktop-directories/*
%{_datadir}/xfce4/backdrops
-%{_datadir}/xfce4/panel-plugins/*
%{_pixmapsdir}/*
%{_iconsdir}/hicolor/*/apps/*
@@ -114,6 +105,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.84.2.1 2010/11/14 12:28:17 baggins
+- 4.7.2, XFCE 4.8pre1
+
Revision 1.84 2010/11/11 21:04:33 baggins
- rel 6
- dirs cleanup
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xfdesktop/xfdesktop-generic-menu.patch?r1=1.1&r2=1.1.2.1&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xfdesktop/xfdesktop.spec?r1=1.84&r2=1.84.2.1&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
