Author: megabajt Date: Wed Feb 16 18:55:03 2011 GMT Module: packages Tag: HEAD ---- Log message: - merged from DEVEL
---- Files affected: packages/xfdesktop: xfdesktop.spec (1.87 -> 1.88) packages/xfwm4: xfwm4.spec (1.61 -> 1.62) ---- Diffs: ================================================================ Index: packages/xfdesktop/xfdesktop.spec diff -u packages/xfdesktop/xfdesktop.spec:1.87 packages/xfdesktop/xfdesktop.spec:1.88 --- packages/xfdesktop/xfdesktop.spec:1.87 Fri Feb 4 19:24:11 2011 +++ packages/xfdesktop/xfdesktop.spec Wed Feb 16 19:54:58 2011 @@ -2,35 +2,36 @@ Summary: Desktop manager for the Xfce Desktop Environment Summary(pl.UTF-8): Zarządca pulpitu dla środowiska Xfce Name: xfdesktop -Version: 4.6.2 -Release: 2 +Version: 4.8.1 +Release: 1 License: GPL v2 Group: X11/Applications -Source0: http://www.xfce.org/archive/xfce-%{version}/src/%{name}-%{version}.tar.bz2 -# Source0-md5: e800ea9fee7a5c5eaf2ae96e23a83e3a -Patch0: %{name}-generic-menu.patch -URL: http://www.xfce.org/projects/xfdesktop/ -BuildRequires: Thunar-devel >= 1.0.0 +Source0: http://archive.xfce.org/src/xfce/xfdesktop/4.8/%{name}-%{version}.tar.bz2 +# Source0-md5: a3a255cc7756ddc2a0a6fdee9fb8b2c9 +URL: http://www.xfce.org/projects/xfdesktop +BuildRequires: Thunar-devel >= 1.2.0 BuildRequires: autoconf >= 2.50 BuildRequires: automake -BuildRequires: exo-devel >= 0.3.100 +BuildRequires: dbus-glib-devel +BuildRequires: exo-devel >= 0.6.0 +BuildRequires: garcon-devel >= 0.1.3 BuildRequires: gettext-devel -BuildRequires: gtk+2-devel >= 2:2.10.6 +BuildRequires: glib2-devel >= 1:2.18.0 +BuildRequires: gtk+2-devel >= 2:2.14.0 BuildRequires: intltool >= 0.35.0 -BuildRequires: libglade2-devel +BuildRequires: libnotify-devel >= 0.4.0 BuildRequires: libtool -BuildRequires: libwnck-devel >= 2.12.0 -BuildRequires: libxfce4menu-devel >= %{version} -BuildRequires: libxfcegui4-devel >= %{version} +BuildRequires: libwnck-devel >= 2.22.0 +BuildRequires: libxfce4ui-devel >= 4.8.0 +BuildRequires: libxfce4util-devel >= 4.8.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} -Requires(post,postun): gtk-update-icon-cache -Requires(post,postun): hicolor-icon-theme +BuildRequires: rpmbuild(macros) >= 1.601 +BuildRequires: xfce4-dev-tools >= 4.8.0 +BuildRequires: xfconf-devel >= 4.8.0 +Requires: garcon >= 0.1.2 +Requires: gtk-update-icon-cache +Requires: hicolor-icon-theme Requires: xfce4-dirs >= 4.6 -Requires: xfce4-panel >= %{version} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -41,21 +42,14 @@ %prep %setup -q -%patch0 -p1 %build -%{__glib_gettextize} -%{__aclocal} -%{__intltoolize} -%{__autoheader} -%{__automake} -%{__aclocal} %configure \ + --disable-silent-rules \ --enable-desktop-icons \ --enable-desktop-menu \ --enable-exo \ --enable-file-icons \ - --enable-panel-plugin \ --enable-thunarx %{__make} @@ -66,9 +60,7 @@ %{__make} install \ DESTDIR=$RPM_BUILD_ROOT -rm -f $RPM_BUILD_ROOT%{_libdir}/xfce4/{panel-plugins,modules}/*.{la,a} - -rm -r $RPM_BUILD_ROOT%{_datadir}/locale/ur_PK +%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/locale/ur_PK %find_lang %{name} @@ -84,29 +76,27 @@ %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 - -%{_datadir}/xfce4/doc/C/*.html -%{_datadir}/xfce4/doc/C/images/*.png -%lang(da) %{_datadir}/xfce4/doc/da/*.html -%lang(fr) %{_datadir}/xfce4/doc/fr/*.html -%lang(fr) %{_datadir}/xfce4/doc/fr/images/*.png -%lang(it) %{_datadir}/xfce4/doc/it/*.html -%lang(it) %{_datadir}/xfce4/doc/it/images/*.png -%lang(ja) %{_datadir}/xfce4/doc/ja/*.html -%lang(ja) %{_datadir}/xfce4/doc/ja/images/*.png + +%dir %{_docdir}/xfdesktop +%dir %{_docdir}/xfdesktop/html +%{_docdir}/xfdesktop/html/C +%{_docdir}/xfdesktop/html/*.css +%lang(bn) %{_docdir}/xfdesktop/html/bn +%lang(ca) %{_docdir}/xfdesktop/html/ca +%lang(da) %{_docdir}/xfdesktop/html/da +%lang(fr) %{_docdir}/xfdesktop/html/fr +%lang(gl) %{_docdir}/xfdesktop/html/gl +%lang(it) %{_docdir}/xfdesktop/html/it +%lang(ja) %{_docdir}/xfdesktop/html/ja +%lang(ru) %{_docdir}/xfdesktop/html/ru +%lang(ug) %{_docdir}/xfdesktop/html/ug +%lang(zh_CN) %{_docdir}/xfdesktop/html/zh_CN %{_mandir}/man1/*.1* -%{_sysconfdir}/xdg/menus %{_desktopdir}/*.desktop -%{_datadir}/desktop-directories/* %{_datadir}/xfce4/backdrops -%{_datadir}/xfce4/panel-plugins/* %{_pixmapsdir}/* %{_iconsdir}/hicolor/*/apps/* @@ -116,6 +106,17 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.88 2011/02/16 18:54:58 megabajt +- merged from DEVEL + +Revision 1.84.2.3 2011/02/11 15:41:18 megabajt +- updated to 4.8.1 + +Revision 1.84.2.2 2011/02/05 22:34:24 megabajt +- updated to 4.8.0 +- -generic-menu.patch seems to be obsoleted +- release 0.1 + Revision 1.87 2011/02/04 18:24:11 wiget - Requires(post,postun): gtk-update-icon-cache @@ -124,6 +125,9 @@ Revision 1.85 2010/11/14 12:50:09 baggins - 4.6.2 + +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 ================================================================ Index: packages/xfwm4/xfwm4.spec diff -u packages/xfwm4/xfwm4.spec:1.61 packages/xfwm4/xfwm4.spec:1.62 --- packages/xfwm4/xfwm4.spec:1.61 Fri Feb 4 19:24:12 2011 +++ packages/xfwm4/xfwm4.spec Wed Feb 16 19:54:58 2011 @@ -2,33 +2,32 @@ Summary: Next generation window manager for Xfce Summary(pl.UTF-8): Zarządca okien nowej generacji dla Xfce Name: xfwm4 -Version: 4.6.2 -Release: 2 +Version: 4.8.1 +Release: 1 License: GPL v2 Group: X11/Applications -Source0: http://www.xfce.org/archive/xfce-%{version}/src/%{name}-%{version}.tar.bz2 -# Source0-md5: 3e6c0c54b028b6ea60e865e55ecdf3f8 -URL: http://www.xfce.org/projects/xfwm4/ +Source0: http://archive.xfce.org/src/xfce/xfwm4/4.8/%{name}-%{version}.tar.bz2 +# Source0-md5: 447433dca613180ebd6cfed4beb1c1c9 +URL: http://www.xfce.org/projects/xfwm4 BuildRequires: autoconf >= 2.52 BuildRequires: automake >= 1:1.8 BuildRequires: dbus-devel >= 1.0.0 BuildRequires: dbus-glib-devel >= 0.72 BuildRequires: gettext-devel -BuildRequires: gtk+2-devel >= 2:2.10.6 +BuildRequires: gtk+2-devel >= 2:2.14.0 BuildRequires: intltool >= 0.35.0 -BuildRequires: libglade2-devel BuildRequires: libtool -BuildRequires: libwnck-devel >= 2.12.0 -BuildRequires: libxfcegui4-devel >= %{version} +BuildRequires: libwnck-devel >= 2.22.0 +BuildRequires: libxfce4ui-devel >= 4.8.0 BuildRequires: pkgconfig >= 1:0.9.0 -BuildRequires: rpmbuild(macros) >= 1.311 +BuildRequires: rpmbuild(macros) >= 1.601 BuildRequires: startup-notification-devel >= 0.8 -BuildRequires: xfce4-dev-tools >= 4.6.0 -BuildRequires: xfconf-devel >= 4.6.0 +BuildRequires: xfce4-dev-tools >= 4.8.0 +BuildRequires: xfconf-devel >= 4.8.0 BuildRequires: xorg-lib-libSM-devel -BuildRequires: xorg-lib-libXpm-devel -Requires(post,postun): gtk-update-icon-cache -Requires(post,postun): hicolor-icon-theme +BuildRequires: xorg-lib-libXcomposite-devel >= 0.2 +Requires: gtk-update-icon-cache +Requires: hicolor-icon-theme Requires: xfce4-dirs >= 4.6 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -49,7 +48,9 @@ %{__autoheader} %{__automake} %{__autoconf} -%configure +%configure \ + --disable-silent-rules + %{__make} %install @@ -59,7 +60,7 @@ %{__make} install \ DESTDIR=$RPM_BUILD_ROOT -rm -r $RPM_BUILD_ROOT%{_datadir}/locale/ur_PK +%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/locale/ur_PK %find_lang %{name} @@ -89,12 +90,17 @@ %{_datadir}/themes/* %{_iconsdir}/hicolor/*/*/* -%{_datadir}/xfce4/doc/C/*.html -%{_datadir}/xfce4/doc/C/images/*.png -%lang(fr) %{_datadir}/xfce4/doc/fr/*.html -%lang(fr) %{_datadir}/xfce4/doc/fr/images/*.png -%lang(it) %{_datadir}/xfce4/doc/it/*.html -%lang(it) %{_datadir}/xfce4/doc/it/images/*.png +%dir %{_docdir}/xfwm4 +%dir %{_docdir}/xfwm4/html +%{_docdir}/xfwm4/html/C +%{_docdir}/xfwm4/html/*.css +%lang(da) %{_docdir}/xfwm4/html/da +%lang(el) %{_docdir}/xfwm4/html/el +%lang(fr) %{_docdir}/xfwm4/html/fr +%lang(gl) %{_docdir}/xfwm4/html/gl +%lang(it) %{_docdir}/xfwm4/html/it +%lang(sv) %{_docdir}/xfwm4/html/sv +%lang(ug) %{_docdir}/xfwm4/html/ug %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -102,6 +108,15 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.62 2011/02/16 18:54:58 megabajt +- merged from DEVEL + +Revision 1.58.2.3 2011/02/11 14:54:00 megabajt +- updated to 4.8.1 + +Revision 1.58.2.2 2011/02/05 23:34:43 megabajt +- updated to 4.8.0 + Revision 1.61 2011/02/04 18:24:12 wiget - Requires(post,postun): gtk-update-icon-cache @@ -110,6 +125,9 @@ Revision 1.59 2010/11/14 12:51:10 baggins - 4.6.2 + +Revision 1.58.2.1 2010/11/14 12:30:35 baggins +- 4.7.1, XFCE 4.8pre1 Revision 1.58 2010/11/11 21:16:19 baggins - apply am patch ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xfdesktop/xfdesktop.spec?r1=1.87&r2=1.88&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xfwm4/xfwm4.spec?r1=1.61&r2=1.62&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
