Author: wiget Date: Mon Mar 28 14:01:16 2011 GMT Module: packages Tag: DEVEL ---- Log message: - renamed back to gnome-desktop
---- Files affected: packages/gnome-desktop: gnome-desktop.spec (1.147 -> 1.147.2.1) ---- Diffs: ================================================================ Index: packages/gnome-desktop/gnome-desktop.spec diff -u packages/gnome-desktop/gnome-desktop.spec:1.147 packages/gnome-desktop/gnome-desktop.spec:1.147.2.1 --- packages/gnome-desktop/gnome-desktop.spec:1.147 Sun Mar 27 14:31:58 2011 +++ packages/gnome-desktop/gnome-desktop.spec Mon Mar 28 16:01:11 2011 @@ -1,39 +1,40 @@ # $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-desktop -Version: 2.32.1 +Version: 2.91.93 Release: 1 License: LGPL Group: X11/Applications -Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-desktop/2.32/%{name}-%{version}.tar.bz2 -# Source0-md5: 5c80d628a240eb9d9ff78913b31f2f67 +Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-desktop/2.91/%{name}-%{version}.tar.bz2 +# Source0-md5: 4535a7139d59c2f67d638e1649831c0c Source1: pld-logo.svg URL: http://www.gnome.org/ -BuildRequires: GConf2-devel >= 2.26.0 BuildRequires: autoconf BuildRequires: automake >= 1:1.9 BuildRequires: docbook-dtd412-xml +BuildRequires: gdk-pixbuf2-devel >= 2.22.0 BuildRequires: gettext-devel -BuildRequires: glib2-devel >= 1:2.20.0 +BuildRequires: glib2-devel >= 1:2.28.0 BuildRequires: gnome-common >= 2.24.0 BuildRequires: gnome-doc-utils >= 0.14.0 -BuildRequires: gtk+2-devel >= 2:2.18.0 +BuildRequires: gobject-introspection-devel >= 0.9.7 +BuildRequires: gsettings-desktop-schemas-devel >= 0.1.4 +BuildRequires: gtk+3-devel >= 3.0.0 BuildRequires: gtk-doc >= 1.8 BuildRequires: intltool >= 0.40.0 BuildRequires: libtool BuildRequires: pkgconfig -BuildRequires: rpm-pythonprov BuildRequires: rpmbuild(find_lang) >= 1.23 BuildRequires: rpmbuild(macros) >= 1.311 BuildRequires: scrollkeeper +BuildRequires: sed >= 4.0 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 -Obsoletes: gnome-core +Obsoletes: gnome-desktop3-libs +Obsoletes: gnome-desktop-libs +Obsoletes: gnome-desktop3 # sr@Latn vs. sr@latin Conflicts: glibc-misc < 6:2.7 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -44,7 +45,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 @@ -53,50 +54,43 @@ 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 +Summary(pl.UTF-8): Pliki nagłówkowe biblioteki GNOME desktop Group: X11/Development/Libraries -Requires: %{name}-libs = %{version}-%{release} -Requires: gtk+2-devel >= 2:2.18.0 +Requires: %{name} = %{version}-%{release} +Requires: gsettings-desktop-schemas-devel >= 0.1.4 +Requires: gtk+3-devel >= 3.0.0 Requires: startup-notification-devel >= 0.8 +Obsoletes: gnome-desktop3-devel %description devel GNOME desktop header files. %description devel -l pl.UTF-8 -Pliki nagłówkowe bibliotek GNOME desktop. +Pliki nagłówkowe biblioteki GNOME desktop. %package static -Summary: GNOME desktop static libraries -Summary(pl.UTF-8): Statyczne biblioteki GNOME desktop +Summary: GNOME desktop static library +Summary(pl.UTF-8): Statyczna biblioteka GNOME desktop Group: X11/Development/Libraries Requires: %{name} = %{version}-%{release} +Obsoletes: gnome-desktop3-static %description static -GNOME desktop static libraries. +GNOME desktop static library. %description static -l pl.UTF-8 -Statyczne biblioteki GNOME desktop. +Statyczna biblioteka GNOME desktop. %package apidocs Summary: gnome-desktop API documentation Summary(pl.UTF-8): Dokumentacja API gnome-desktop Group: Documentation Requires: gtk-doc-common +Obsoletes: gnome-desktop3-apidocs %description apidocs gnome-desktop API documentation. @@ -107,6 +101,9 @@ %prep %setup -q +sed -i -e 's/^kg//' po/LINGUAS +%{__rm} po/kg.po + %build %{__gtkdocize} %{__intltoolize} @@ -131,8 +128,6 @@ %{__make} install \ DESTDIR=$RPM_BUILD_ROOT -%{__rm} $RPM_BUILD_ROOT%{_pixmapsdir}/gnome-logo-icon-transparent.png -install %{SOURCE1} $RPM_BUILD_ROOT%{_pixmapsdir}/gnome-logo-icon-transparent.svg %{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la %find_lang %{name} --with-gnome --with-omf --all-name @@ -141,42 +136,36 @@ rm -rf $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 -%{_pixmapsdir}/* -%{_desktopdir}/gnome-about.desktop - -%files libs -%defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/libgnome-desktop-2.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libgnome-desktop-2.so.17 +%attr(755,root,root) %{_libdir}/libgnome-desktop-3.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libgnome-desktop-3.so.0 +%{_datadir}/gnome/gnome-version.xml +%{_datadir}/libgnome-desktop-3.0 +%{_libdir}/girepository-1.0/GnomeDesktop-3.0.typelib %files devel %defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/libgnome-desktop-2.so -%{_includedir}/gnome-desktop-2.0 -%{_pkgconfigdir}/gnome-desktop-2.0.pc +%attr(755,root,root) %{_libdir}/libgnome-desktop-3.so +%{_includedir}/gnome-desktop-3.0 +%{_pkgconfigdir}/gnome-desktop-3.0.pc +%{_datadir}/gir-1.0/GnomeDesktop-3.0.gir %files static %defattr(644,root,root,755) -%{_libdir}/libgnome-desktop-2.a +%{_libdir}/libgnome-desktop-3.a %files apidocs %defattr(644,root,root,755) -%{_gtkdocdir}/gnome-desktop +%{_gtkdocdir}/gnome-desktop3 %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -184,6 +173,62 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.147.2.1 2011/03/28 14:01:11 wiget +- renamed back to gnome-desktop + +Revision 1.17 2011/03/27 12:34:00 qboosh +- single library inside + +Revision 1.16 2011/03/24 17:42:46 megabajt +- updated to 2.91.93 + +Revision 1.15 2011/03/22 17:56:37 wiget +- up to 2.91.92 + +Revision 1.14 2011/03/07 21:18:49 wiget +- up to 2.91.91 + +Revision 1.13 2011/02/22 13:09:34 megabajt +- updated to 2.91.90 + +Revision 1.12 2011/02/12 14:44:36 wiget +- BR stable gtk+3 and glib2 + +Revision 1.11 2011/02/06 16:50:37 sparky +- unified %clean section + +Revision 1.10 2011/02/04 20:52:58 megabajt +- removed kg locale +- fixed requires (python deps were required by gnome-about) + +Revision 1.9 2011/02/03 13:51:27 wiget +- 2.91.6.1 + +Revision 1.8 2011/01/13 21:53:27 wiget +- 2.91.6 + +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 + +Revision 1.5 2010/12/02 21:52:38 wiget +- 2.91.3 + +Revision 1.4 2010/11/20 16:58:32 megabajt +- updated to 2.91.2 + +Revision 1.3 2010/11/10 22:58:56 megabajt +- updated to 2.91.1 + +Revision 1.2 2010/10/31 18:50:30 megabajt +- updated to 2.91.0 + +Revision 1.1 2010/07/22 21:41:17 patrys +- forked as 3 is parallel-installable + Revision 1.147 2011/03/27 12:31:58 qboosh - en@shaw locale is now supported (via LANGUAGE) - __rm macro WITHOUT -f, so it actually makes sense) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gnome-desktop/gnome-desktop.spec?r1=1.147&r2=1.147.2.1&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
