Author: wiget Date: Tue Dec 28 22:31:33 2010 GMT Module: packages Tag: HEAD ---- Log message: - 2.91.4 - gnome-about dropped upstream, merged -libs into main package
---- Files affected: packages/gnome-desktop3: gnome-desktop3.spec (1.6 -> 1.7) , gtk3.patch (1.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ Index: packages/gnome-desktop3/gnome-desktop3.spec diff -u packages/gnome-desktop3/gnome-desktop3.spec:1.6 packages/gnome-desktop3/gnome-desktop3.spec:1.7 --- packages/gnome-desktop3/gnome-desktop3.spec:1.6 Thu Dec 9 20:27:22 2010 +++ packages/gnome-desktop3/gnome-desktop3.spec Tue Dec 28 23:31:28 2010 @@ -1,15 +1,14 @@ # $Revision$, $Date$ -Summary: The core programs for the GNOME GUI desktop environment -Summary(pl.UTF-8): Podstawowe programy środowiska graficznego GNOME +Summary: gnome-desktop library +Summary(pl.UTF-8): Biblioteka gnome-desktop Name: gnome-desktop3 -Version: 2.91.3 -Release: 2 +Version: 2.91.4 +Release: 1 License: LGPL Group: X11/Applications Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-desktop/2.91/gnome-desktop-%{version}.tar.bz2 -# Source0-md5: a204082c65e09fc7278f7c401b895d6a +# Source0-md5: 60b555cb73b2ac4c90d296b071e8791b Source1: pld-logo.svg -Patch0: gtk3.patch URL: http://www.gnome.org/ BuildRequires: GConf2-devel >= 2.26.0 BuildRequires: autoconf @@ -21,7 +20,7 @@ BuildRequires: gnome-common >= 2.24.0 BuildRequires: gnome-doc-utils >= 0.14.0 BuildRequires: gsettings-desktop-schemas-devel -BuildRequires: gtk+3-devel >= 2.91.0 +BuildRequires: gtk+3-devel >= 2.91.7 BuildRequires: gtk-doc >= 1.8 BuildRequires: intltool >= 0.40.0 BuildRequires: libtool @@ -34,11 +33,11 @@ BuildRequires: startup-notification-devel >= 0.8 BuildRequires: xorg-lib-libXrandr-devel >= 1.2 Requires(post,postun): scrollkeeper -Requires: %{name}-libs = %{version}-%{release} Requires: python-gnome Requires: python-pygtk-gtk # s...@latn vs. s...@latin Conflicts: glibc-misc < 6:2.7 +Obsoletes: gnome-desktop3-libs BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -47,7 +46,7 @@ manager for the X Window System. GNOME is similar in purpose and scope to CDE and KDE, but GNOME is based completely on free software. -This package contains applications related to GNOME desktop. +This package contains gnome-desktop library. %description -l pl.UTF-8 GNOME (GNU Network Object Model Environment) jest zestawem przyjaznych @@ -56,24 +55,13 @@ zakresem funkcjonalności CDE i KDE, jednak GNOME opiera się w całości na wolnym oprogramowaniu. -Ten pakiet zawiera aplikacje związane w desktopem GNOME. - -%package libs -Summary: gnome-desktop library -Summary(pl.UTF-8): Biblioteka gnome-desktop -Group: X11/Libraries - -%description libs -This package contains gnome-desktop library. - -%description libs -l pl.UTF-8 Pakiet ten zawiera bibliotekę gnome-desktop. %package devel Summary: GNOME desktop includes Summary(pl.UTF-8): Pliki nagłówkowe bibliotek GNOME desktop Group: X11/Development/Libraries -Requires: %{name}-libs = %{version}-%{release} +Requires: %{name} = %{version}-%{release} Requires: gsettings-desktop-schemas-devel Requires: gtk+3-devel >= 2.91.0 Requires: startup-notification-devel >= 0.8 @@ -110,7 +98,6 @@ %prep %setup -q -n gnome-desktop-%{version} -%patch0 -p1 sed -i -e 's/e...@shaw//' po/LINGUAS rm -f po/e...@shaw.po @@ -147,25 +134,17 @@ rm -fr $RPM_BUILD_ROOT %post +/sbin/ldconfig %scrollkeeper_update_post %postun +/sbin/ldconfig %scrollkeeper_update_postun -%post libs -p /sbin/ldconfig -%postun libs -p /sbin/ldconfig - %files -f %{name}.lang %defattr(644,root,root,755) %doc AUTHORS ChangeLog MAINTAINERS NEWS README -%attr(755,root,root) %{_bindir}/gnome-about -%{_mandir}/man1/gnome-about.1* -%{_datadir}/gnome-about %{_datadir}/libgnome-desktop-3.0 -%{_desktopdir}/gnome-about.desktop - -%files libs -%defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/libgnome-desktop-3.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libgnome-desktop-3.so.0 @@ -189,6 +168,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.7 2010/12/28 22:31:28 wiget +- 2.91.4 +- gnome-about dropped upstream, merged -libs into main package + Revision 1.6 2010/12/09 19:27:22 wiget - added gtk3.patch to fix compilation with gtk+ 2.91.6 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gnome-desktop3/gnome-desktop3.spec?r1=1.6&r2=1.7&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
