Author: megabajt Date: Wed Feb 16 17:31:40 2011 GMT Module: packages Tag: HEAD ---- Log message: - merged from DEVEL
---- Files affected: packages/libxfcegui4: libxfcegui4.spec (1.80 -> 1.81) packages/xfconf: xfconf.spec (1.11 -> 1.12) packages/libxfce4util: libxfce4util.spec (1.62 -> 1.63) ---- Diffs: ================================================================ Index: packages/libxfcegui4/libxfcegui4.spec diff -u packages/libxfcegui4/libxfcegui4.spec:1.80 packages/libxfcegui4/libxfcegui4.spec:1.81 --- packages/libxfcegui4/libxfcegui4.spec:1.80 Fri Feb 4 19:23:56 2011 +++ packages/libxfcegui4/libxfcegui4.spec Wed Feb 16 18:31:35 2011 @@ -3,37 +3,32 @@ # Conditional build: %bcond_without static_libs # don't build static library # -%define xfce_version 4.6.2 +%define xfce_version 4.8.0 Summary: Various GTK+ widgets for Xfce Summary(pl.UTF-8): Różne widgety GTK+ dla Xfce Name: libxfcegui4 -Version: 4.6.4 -Release: 2 +Version: 4.8.0 +Release: 1 License: LGPL v2 Group: X11/Libraries -Source0: http://www.xfce.org/archive/xfce/%{xfce_version}/src/%{name}-%{version}.tar.bz2 -# Source0-md5: 88de59b222cb9977f93a4c61011c1e1f -URL: http://www.xfce.org/projects/libraries/ -BuildRequires: autoconf >= 2.50 -BuildRequires: automake +Source0: http://archive.xfce.org/xfce/4.8/src/%{name}-%{version}.tar.bz2 +# Source0-md5: 74fe7b81051450785fa8270aed1e6e5c +URL: http://www.xfce.org/ BuildRequires: docbook-dtd412-xml BuildRequires: gettext-devel BuildRequires: gtk+2-devel >= 2:2.10.6 BuildRequires: gtk-doc BuildRequires: gtk-doc-automake -BuildRequires: intltool BuildRequires: libglade2-devel >= 1:2.6.0 BuildRequires: libgladeui-devel >= 3.0.0 -BuildRequires: libtool BuildRequires: libxfce4util-devel >= %{xfce_version} 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 >= %{xfce_version} +BuildRequires: xfce4-dev-tools >= 4.8.0 BuildRequires: xorg-lib-libSM-devel -Requires(post,postun): gtk-update-icon-cache -Requires(post,postun): hicolor-icon-theme +Requires: gtk-update-icon-cache +Requires: hicolor-icon-theme Requires: xfconf >= %{xfce_version} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -63,7 +58,6 @@ Requires: gtk+2-devel >= 2:2.10.6 Requires: libxfce4util-devel >= %{xfce_version} Requires: startup-notification-devel >= 0.8 -Requires: xfconf-devel >= %{xfce_version} Requires: xorg-lib-libSM-devel %description devel @@ -100,16 +94,12 @@ %setup -q %build -%{__gtkdocize} -%{__libtoolize} -%{__aclocal} -%{__autoheader} -%{__automake} -%{__autoconf} %configure \ --enable-gtk-doc \ --with-html-dir=%{_gtkdocdir} \ - %{!?with_static_libs:--disable-static} + %{!?with_static_libs:--disable-static} \ + --disable-silent-rules + %{__make} %install @@ -124,7 +114,8 @@ %{__rm} $RPM_BUILD_ROOT%{_libdir}/glade3/modules/libgladexfce4.{a,la} %{__rm} $RPM_BUILD_ROOT%{_libdir}/libglade/2.0/libxfce4.{a,la} -%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/locale/ur_PK +%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/locale/{tl_PH,ur_PK} +%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la %find_lang %{name} @@ -142,14 +133,11 @@ %files -f %{name}.lang %defattr(644,root,root,755) %doc AUTHORS ChangeLog NEWS README -%attr(755,root,root) %{_libdir}/libxfce4kbd-private.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libxfce4kbd-private.so.5 %attr(755,root,root) %{_libdir}/libxfcegui4.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libxfcegui4.so.4 %attr(755,root,root) %{_libdir}/libglade/2.0/libxfce4.so %{_iconsdir}/hicolor/*/apps/*.png %{_iconsdir}/hicolor/*/apps/*.svg -%{_sysconfdir}/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml %files apidocs %defattr(644,root,root,755) @@ -157,19 +145,13 @@ %files devel %defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/libxfce4kbd-private.so %attr(755,root,root) %{_libdir}/libxfcegui4.so -%{_libdir}/libxfce4kbd-private.la -%{_libdir}/libxfcegui4.la -%{_includedir}/xfce4/libxfce4kbd-private %{_includedir}/xfce4/libxfcegui4 -%{_pkgconfigdir}/libxfce4kbd-private-1.0.pc %{_pkgconfigdir}/libxfcegui4-1.0.pc %if %{with static_libs} %files static %defattr(644,root,root,755) -%{_libdir}/libxfce4kbd-private.a %{_libdir}/libxfcegui4.a %endif @@ -186,9 +168,21 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.81 2011/02/16 17:31:35 megabajt +- merged from DEVEL + +Revision 1.75.2.4 2011/02/07 19:40:04 megabajt +- drop libtool file + Revision 1.80 2011/02/04 18:23:56 wiget - Requires(post,postun): gtk-update-icon-cache +Revision 1.75.2.3 2011/01/27 20:01:35 megabajt +- updated to 4.8.0 + +Revision 1.75.2.2 2010/11/15 13:25:50 baggins +- no need to rebuild ac/am + Revision 1.79 2010/11/14 16:09:56 baggins - removing directory @@ -200,6 +194,9 @@ Revision 1.76 2010/11/14 12:39:32 baggins - 4.6.2, XFCE 4.6.2 + +Revision 1.75.2.1 2010/11/14 12:09:24 baggins +- 4.7.0, XFCE 4.8pre1 Revision 1.75 2010/01/30 22:55:20 sparky - BR: docbook-dtd412-xml, gtk-doc ================================================================ Index: packages/xfconf/xfconf.spec diff -u packages/xfconf/xfconf.spec:1.11 packages/xfconf/xfconf.spec:1.12 --- packages/xfconf/xfconf.spec:1.11 Sun Jan 30 17:24:50 2011 +++ packages/xfconf/xfconf.spec Wed Feb 16 18:31:35 2011 @@ -5,20 +5,20 @@ Summary: Simple configuration storage and query system Summary(pl.UTF-8): Prosty system przechowywania i odpytywania konfiguracji Name: xfconf -Version: 4.6.2 -Release: 3 +Version: 4.8.0 +Release: 1 License: GPL v2 Group: Libraries -Source0: http://www.xfce.org/archive/xfce-%{version}/src/%{name}-%{version}.tar.bz2 -# Source0-md5: 5ff93c15077c6dbbcd38c437bc1ab2ef -URL: http://www.xfce.org/projects/xfconf/ +Source0: http://archive.xfce.org/xfce/4.8/src/%{name}-%{version}.tar.bz2 +# Source0-md5: 0f11ed1ec7789c5c4c3fcc7cdb3c2940 +URL: http://www.xfce.org/projects/xfconf BuildRequires: autoconf >= 2.50 BuildRequires: automake >= 1:1.8 BuildRequires: dbus-devel >= 1.0.0 BuildRequires: dbus-glib-devel >= 0.72 BuildRequires: docbook-dtd412-xml BuildRequires: gettext-devel -BuildRequires: glib2-devel >= 1:2.12.0 +BuildRequires: glib2-devel >= 1:2.18.0 BuildRequires: gtk-doc >= 1.0 BuildRequires: intltool BuildRequires: libtool @@ -29,7 +29,7 @@ BuildRequires: pkgconfig BuildRequires: rpm-perlprov BuildRequires: rpmbuild(macros) >= 1.98 -BuildRequires: xfce4-dev-tools >= 4.6.0 +BuildRequires: xfce4-dev-tools >= 4.8.0 Obsoletes: libxfce4mcs BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -47,7 +47,7 @@ Requires: %{name} = %{version}-%{release} Requires: dbus-devel >= 1.0.0 Requires: dbus-glib-devel >= 0.72 -Requires: glib2-devel >= 1:2.12.0 +Requires: glib2-devel >= 1:2.18.0 Obsoletes: libxfce4mcs-devel Obsoletes: xfce-mcs-manager-devel @@ -107,7 +107,8 @@ %configure \ --enable-gtk-doc \ --with-html-dir=%{_gtkdocdir} \ - --with-perl-options="INSTALLDIRS=vendor" + --with-perl-options="INSTALLDIRS=vendor" \ + --disable-silent-rules %{__make} %install @@ -121,6 +122,7 @@ %{__rm} $RPM_BUILD_ROOT%{perl_vendorarch}/auto/Xfce4/Xfconf/.packlist %{__rm} -r $RPM_BUILD_ROOT%{_datadir}/locale/ur_PK +%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la %find_lang %{name} @@ -136,7 +138,8 @@ %attr(755,root,root) %{_bindir}/xfconf-query %attr(755,root,root) %{_libdir}/libxfconf-0.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libxfconf-0.so.2 -%attr(755,root,root) %{_libdir}/xfconfd +%dir %{_libdir}/xfce4/xfconf +%attr(755,root,root) %{_libdir}/xfce4/xfconf/xfconfd %dir %{_sysconfdir}/xdg/xfce4/xfconf %dir %{_sysconfdir}/xdg/xfce4/xfconf/xfce-perchannel-xml %{_datadir}/dbus-1/services/org.xfce.Xfconf.service @@ -144,7 +147,6 @@ %files devel %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/libxfconf-0.so -%{_libdir}/libxfconf-0.la %{_includedir}/xfce4/xfconf-0 %{_pkgconfigdir}/libxfconf-0.pc @@ -174,9 +176,18 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.12 2011/02/16 17:31:35 megabajt +- merged from DEVEL + +Revision 1.7.2.3 2011/02/07 20:52:08 megabajt +- drop libtool file + Revision 1.11 2011/01/30 16:24:50 sparky - BR: docbook-dtd412-xml, intltool +Revision 1.7.2.2 2011/01/27 19:48:57 megabajt +- updated to 4.8.0 + Revision 1.10 2010/11/14 16:10:25 baggins - rel 3 - properly remove a directory @@ -187,6 +198,9 @@ Revision 1.8 2010/11/14 12:48:57 baggins - 4.6.2 + +Revision 1.7.2.1 2010/11/14 12:25:59 baggins +- 4.7.3, XFCE 4.8pre1 Revision 1.7 2010/06/06 15:43:27 arekm - release 2 ================================================================ Index: packages/libxfce4util/libxfce4util.spec diff -u packages/libxfce4util/libxfce4util.spec:1.62 packages/libxfce4util/libxfce4util.spec:1.63 --- packages/libxfce4util/libxfce4util.spec:1.62 Sat Feb 5 00:36:52 2011 +++ packages/libxfce4util/libxfce4util.spec Wed Feb 16 18:31:35 2011 @@ -7,13 +7,13 @@ Summary: Utility library for the Xfce desktop environment Summary(pl.UTF-8): Biblioteka narzędziowa dla środowiska Xfce Name: libxfce4util -Version: 4.6.2 -Release: 2 +Version: 4.8.1 +Release: 1 License: BSD, LGPL Group: Libraries -Source0: http://www.xfce.org/archive/xfce-%{version}/src/%{name}-%{version}.tar.bz2 -# Source0-md5: 9c3129d827d480f0906c575e7a13f1e9 -URL: http://www.xfce.org/projects/libraries/ +Source0: http://archive.xfce.org/xfce/4.8/src/%{name}-%{version}.tar.bz2 +# Source0-md5: 2be3af4c7db5ad293a7525e1021e6f0f +URL: http://www.xfce.org/projects/libxfce4 BuildRequires: autoconf >= 2.50 BuildRequires: automake BuildRequires: docbook-dtd412-xml @@ -25,7 +25,7 @@ BuildRequires: libtool BuildRequires: pkgconfig >= 1:0.9.0 BuildRequires: rpmbuild(macros) >= 1.98 -BuildRequires: xfce4-dev-tools >= 4.6.0 +BuildRequires: xfce4-dev-tools >= 4.8.0 Requires: xfce4-dirs >= 4.6 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -96,7 +96,8 @@ %configure \ --%{?with_apidocs:en}%{!?with_apidocs:dis}able-gtk-doc \ --with-html-dir=%{_gtkdocdir} \ - %{!?with_static_libs:--disable-static} + %{!?with_static_libs:--disable-static} \ + --disable-silent-rules %{__make} %install @@ -107,7 +108,8 @@ %{!?with_apidocs:rm -rf $RPM_BUILD_ROOT%{_gtkdocdir}/libxfce4util} -rm -r $RPM_BUILD_ROOT%{_datadir}/locale/ur_PK +%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/locale/{tl_PH,ur_PK} +%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la %find_lang %{name} @@ -132,7 +134,6 @@ %files devel %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/libxfce4util.so -%{_libdir}/libxfce4util.la %dir %{_includedir}/xfce4 %{_includedir}/xfce4/libxfce4util %{_pkgconfigdir}/libxfce4util-1.0.pc @@ -153,18 +154,30 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.63 2011/02/16 17:31:35 megabajt +- merged from DEVEL + +Revision 1.58.2.3 2011/02/07 19:40:04 megabajt +- drop libtool file + Revision 1.62 2011/02/04 23:36:52 sparky - %description <name> for correct %package Revision 1.61 2011/02/02 01:58:23 sparky - BR: docbook-dtd412-xml, intltool +Revision 1.58.2.2 2011/01/27 19:15:46 megabajt +- updated to 4.8.1 + Revision 1.60 2010/11/14 14:27:39 baggins - rel 2 - no ur_PK here Revision 1.59 2010/11/14 12:37:06 baggins - 4.6.2 + +Revision 1.58.2.1 2010/11/14 12:08:25 baggins +- 4.7.3, XFCE 4.8pre1 Revision 1.58 2010/11/11 20:48:02 baggins - rel 3 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libxfcegui4/libxfcegui4.spec?r1=1.80&r2=1.81&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xfconf/xfconf.spec?r1=1.11&r2=1.12&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libxfce4util/libxfce4util.spec?r1=1.62&r2=1.63&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
