SPECS (AC-branch): gnome-desktop.spec - merged from HEAD
baggins
baggins at pld-linux.org
Mon May 15 17:15:32 CEST 2006
Author: baggins Date: Mon May 15 15:15:32 2006 GMT
Module: SPECS Tag: AC-branch
---- Log message:
- merged from HEAD
---- Files affected:
SPECS:
gnome-desktop.spec (1.87 -> 1.87.2.1)
---- Diffs:
================================================================
Index: SPECS/gnome-desktop.spec
diff -u SPECS/gnome-desktop.spec:1.87 SPECS/gnome-desktop.spec:1.87.2.1
--- SPECS/gnome-desktop.spec:1.87 Wed Feb 8 19:03:28 2006
+++ SPECS/gnome-desktop.spec Mon May 15 17:15:27 2006
@@ -1,15 +1,14 @@
# $Revision$, $Date$
-Summary: The core programs for the GNOME2 GUI desktop environment
-Summary(pl): Podstawowe programy środowiska graficznego GNOME2
+Summary: The core programs for the GNOME GUI desktop environment
+Summary(pl): Podstawowe programy środowiska graficznego GNOME
Name: gnome-desktop
-Version: 2.12.3
+Version: 2.14.1.1
Release: 1
License: LGPL
Group: X11/Applications
-Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-desktop/2.12/%{name}-%{version}.tar.bz2
-# Source0-md5: 387efe89249c61e512812568047be654
+Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-desktop/2.14/%{name}-%{version}.tar.bz2
+# Source0-md5: f3ffb360681c1dc17d1856f19a59e88f
Source1: pld-logo.svg
-# Source1-md5: 9fda4ca70a6e8e82e8e5bebe0e28db74
Patch0: %{name}-crystalsvg.patch
Patch1: %{name}-desktop.patch
URL: http://www.gnome.org/
@@ -17,64 +16,77 @@
BuildRequires: automake
BuildRequires: gnome-common >= 2.8.0
BuildRequires: gnome-doc-utils >= 0.3.1-2
-BuildRequires: gnome-vfs2-devel >= 2.11.90
+BuildRequires: gnome-vfs2-devel >= 2.14.0
BuildRequires: gtk+2-devel >= 2:2.8.0
+BuildRequires: gtk-doc >= 1.4
BuildRequires: intltool
-BuildRequires: libgnomeui-devel >= 2.10.0-2
+BuildRequires: libgnomeui-devel >= 2.14.0
BuildRequires: libtool
-BuildRequires: rpmbuild(macros) >= 1.197
BuildRequires: pkgconfig
+BuildRequires: rpmbuild(macros) >= 1.197
+BuildRequires: scrollkeeper
BuildRequires: startup-notification-devel >= 0.8
BuildRequires: scrollkeeper
-Requires(post,postun): /sbin/ldconfig
Requires(post,postun): scrollkeeper
-Requires: libgnomeui >= 2.10.0-2
+Requires: %{name}-libs = %{version}-%{release}
Obsoletes: gnome-core
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
-GNOME2 (GNU Network Object Model Environment) is a user-friendly set
+GNOME (GNU Network Object Model Environment) is a user-friendly set
of applications and desktop tools to be used in conjunction with a
-window manager for the X Window System. GNOME2 is similar in purpose
-and scope to CDE and KDE, but GNOME2 is based completely on free
+window 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 GNOME2 desktop.
+This package contains applications related to GNOME desktop.
%description -l pl
-GNOME2 (GNU Network Object Model Environment) jest zestawem
+GNOME (GNU Network Object Model Environment) jest zestawem
przyjaznych dla użytkownika programów i narzędzi biurkowych, których
-używa się wraz z zarządcą okien systemu X Window. GNOME2 przypomina
-wyglądem i zakresem funkcjonalności CDE i KDE, jednak GNOME2 opiera
+używa się wraz z zarządcą okien systemu X Window. GNOME przypomina
+wyglądem i 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 GNOME2.
+Ten pakiet zawiera aplikacje związane w desktopem GNOME.
+
+%package libs
+Summary: gnome-desktop library
+Summary(pl): Biblioteka gnome-desktop
+Group: Development/Libraries
+Requires: libgnomeui >= 2.14.0
+
+%description libs
+This package contains gnome-desktop library.
+
+%description libs -l pl
+Pakiet ten zawiera bibliotekę gnome-desktop.
%package devel
-Summary: GNOME2 desktop includes
-Summary(pl): Pliki nagłówkowe bibliotek GNOME2 desktop
+Summary: GNOME desktop includes
+Summary(pl): Pliki nagłówkowe bibliotek GNOME desktop
Group: X11/Development/Libraries
-Requires: %{name} = %{version}-%{release}
-Requires: libgnomeui-devel >= 2.10.0-2
+Requires: %{name}-libs = %{version}-%{release}
+Requires: libgnomeui-devel >= 2.14.0
Requires: startup-notification-devel >= 0.8
%description devel
-GNOME2 desktop header files.
+GNOME desktop header files.
%description devel -l pl
-Pliki nagłówkowe bibliotek GNOME2 desktop.
+Pliki nagłówkowe bibliotek GNOME desktop.
%package static
-Summary: GNOME2 desktop static libraries
-Summary(pl): Statyczne biblioteki GNOME2 desktop
+Summary: GNOME desktop static libraries
+Summary(pl): Statyczne biblioteki GNOME desktop
Group: X11/Development/Libraries
Requires: %{name} = %{version}-%{release}
%description static
-GNOME2 desktop static libraries.
+GNOME desktop static libraries.
%description static -l pl
-Statyczne biblioteki GNOME2 desktop.
+Statyczne biblioteki GNOME desktop.
%prep
%setup -q
@@ -82,6 +94,7 @@
%patch1 -p1
%build
+%{__intltoolize}
gnome-doc-prepare --copy --force
%{__gnome_doc_common}
%{__intltoolize}
@@ -91,7 +104,8 @@
%{__autoheader}
%{__automake}
%configure \
- --with-gnome-distributor="PLD Linux Distribution"
+ --with-gnome-distributor="PLD Linux Distribution" \
+ --with-html-dir=%{_gtkdocdir}
%{__make}
%install
@@ -99,7 +113,7 @@
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-
+
rm -rf $RPM_BUILD_ROOT%{_pixmapsdir}/gnome-logo-icon-transparent.png
install %{SOURCE1} $RPM_BUILD_ROOT%{_pixmapsdir}/gnome-logo-icon-transparent.svg
@@ -111,18 +125,18 @@
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 NEWS README
%attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %{_libdir}/lib*.so.*.*
%doc %{_mandir}/man1/*
%{_datadir}/gnome-about
%{_pixmapsdir}/*
@@ -132,12 +146,17 @@
%{_omf_dest_dir}/lgpl
%{_desktopdir}/*.desktop
+%files libs
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/lib*.so.*.*
+
%files devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/lib*.so
%{_libdir}/lib*.la
%{_includedir}/gnome-desktop-2.0
%{_pkgconfigdir}/*.pc
+%{_gtkdocdir}/*
%files static
%defattr(644,root,root,755)
@@ -149,6 +168,49 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.87.2.1 2006/05/15 15:15:27 baggins
+- merged from HEAD
+
+Revision 1.91 2006/04/12 16:14:12 freetz
+- 2.14.1.1
+
+Revision 1.90 2006/04/10 17:26:02 freetz
+- 2.14.1
+
+Revision 1.89 2006/04/02 10:35:48 freetz
+- merged from DEVEL
+
+Revision 1.86.2.9 2006/03/21 18:23:02 freetz
+- libs subpackage, rel.3
+
+Revision 1.86.2.8 2006/03/21 16:42:28 freetz
+- rel.2
+
+Revision 1.86.2.7 2006/03/13 21:12:05 freetz
+- 2.14.0
+
+Revision 1.86.2.6 2006/03/03 15:17:19 freetz
+- store pld-logo.svg in cvs (instead of distfiles)
+
+Revision 1.86.2.5 2006/03/03 12:34:51 sparky
+- pld-logo.svg is OK
+
+Revision 1.86.2.4 2006/03/03 11:58:28 wrobell
+- ver. 2.13.92
+- where is pld-logo.svg? wrong md5sum?
+
+Revision 1.86.2.3 2006/02/13 20:36:57 freetz
+- 2.13.91
+
+Revision 1.86.2.2 2006/01/27 20:09:57 freetz
+- 2.13.90
+
+Revision 1.86.2.1 2006/01/22 19:36:05 freetz
+- 2.13.5
+
+Revision 1.88 2006/02/28 23:37:25 glen
+- adapterized (killed trailing spaces/tabs)
+
Revision 1.87 2006/02/08 18:03:28 freetz
- 2.12.3, call intltoolize
@@ -247,7 +309,7 @@
Revision 1.67.2.8 2004/08/30 15:48:00 grzegol
- updated to 2.7.92
- removed outdated locale-names patch
-- remove no locale in %%install
+- remove no locale in %install
Revision 1.67.2.7 2004/08/22 21:31:00 aflinta
- rebuild with howl, release 2
@@ -311,7 +373,7 @@
Revision 1.61.2.5 2004/02/04 14:05:32 grzegol
- updated to 2.5.4
-- added scrollkeeper-update to %%post
+- added scrollkeeper-update to %post
Revision 1.61.2.4 2004/01/14 20:41:03 grzegol
- updated to 2.5.3
@@ -372,7 +434,7 @@
- version 2.3.3.1
Revision 1.46 2003/06/06 16:46:49 aflinta
- - version 2.3.3
+- version 2.3.3
Revision 1.45 2003/05/25 11:00:51 malekith
- massive attack, adding Source-md5
@@ -415,7 +477,7 @@
- updated to version 2.2.0
Revision 1.32 2003/01/17 08:42:14 trojan
-- fided %%files (no need 755 for *.la)
+- fided %files (no need 755 for *.la)
Revision 1.31 2003/01/06 08:46:46 aflinta
- updated to version 2.1.90
@@ -436,9 +498,9 @@
- rel. 2 to build with relocated libgnome
Revision 1.25 2002/11/25 01:41:03 ankry
-Massive attack:
+ Massive attack:
- s/man[ea]d[zż][ae]r/zarządca/g
-- (some) new %%doc
+- (some) new %doc
Revision 1.24 2002/11/04 08:02:03 aflinta
- updated to version 2.1.2
@@ -472,27 +534,27 @@
- updated to version 2.0.2
Revision 1.14 2002/06/17 13:16:24 wiget
-updated to 2.0.1
+- updated to 2.0.1
Revision 1.13 2002/06/12 10:49:55 wiget
-force newer build env
+- force newer build env
Revision 1.12 2002/06/11 07:44:37 wiget
-updated to 2.0.0
+- updated to 2.0.0
Revision 1.11 2002/05/29 07:53:21 wiget
-1.5.21
+- 1.5.21
Revision 1.10 2002/05/21 13:47:21 wiget
- updated to 1.5.20
-- "new %%doc"
+- "new %doc"
Revision 1.9 2002/05/14 19:10:27 qboosh
- fixed descriptions after copy-paste, added the rest of pl ones
- fix in -static file list
Revision 1.8 2002/05/14 18:41:22 michuz
- - updated to 1.5.19
+- updated to 1.5.19
Revision 1.7 2002/04/29 16:53:55 misiek
- updated to 1.5.18
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/gnome-desktop.spec?r1=1.87&r2=1.87.2.1&f=u
More information about the pld-cvs-commit
mailing list