SPECS: Terminal.spec - merged from DEVEL

[freetz]

Author: freetz                       Date: Sun Jul 16 19:02:54 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merged from DEVEL

---- Files affected:
SPECS:
   Terminal.spec (1.14 -> 1.15) 

---- Diffs:

================================================================
Index: SPECS/Terminal.spec
diff -u SPECS/Terminal.spec:1.14 SPECS/Terminal.spec:1.15
--- SPECS/Terminal.spec:1.14	Mon May 22 00:17:45 2006
+++ SPECS/Terminal.spec	Sun Jul 16 21:02:48 2006
@@ -1,24 +1,34 @@
 # $Revision$, $Date$
-%define		pre	%{nil}
+#
+%define		pre		beta2
+%define		xfce_version	4.3.90.2
+#
 Summary:	X Terminal Emulator
 Summary(pl):	Emulator terminala dla X
 Name:		Terminal
-Version:	0.2.4
-Release:	3
+Version:	0.2.5.4
+Release:	0.%{pre}.1
 License:	GPL v2
 Group:		X11/Applications
-Source0:	http://download.berlios.de/xfce-goodies/%{name}-%{version}%{pre}.tar.bz2
-# Source0-md5:	d9f8c9db0a27c4d304e1c4fd2ca3a371
+Source0:	http://www.xfce.org/archive/xfce-%{xfce_version}/src/%{name}-%{version}%{pre}.tar.bz2
+# Source0-md5:	9f129b5d143a707394aa7aa139a67afa
 URL:		http://www.os-cillation.com/
-BuildRequires:	dbus-glib-devel >= 0.33
+BuildRequires:	autoconf >= 2.50
+BuildRequires:	automake
+BuildRequires:	dbus-glib-devel >= 0.62
 BuildRequires:	gettext-devel
-BuildRequires:	libexo-devel >= 0.3.0
-BuildRequires:	libxfcegui4-devel >= 4.2.0
+BuildRequires:	gtk+2-devel >= 2:2.10.0
+BuildRequires:	intltool >= 0.35
+BuildRequires:	libexo-devel >= 0.3.1.8
+BuildRequires:	libtool
+BuildRequires:	libxfcegui4-devel >= %{xfce_version}
 BuildRequires:	ncurses-devel
 BuildRequires:	perl-XML-Parser
 BuildRequires:	pkgconfig
 BuildRequires:	sed >= 4.0
-BuildRequires:	vte-devel >= 0.11.11
+BuildRequires:	vte-devel >= 0.13.3
+BuildRequires:	xfce4-dev-tools >= %{xfce_version}
+Requires(post,postun):	gtk+2 >= 2:2.10.0
 Obsoletes:	xfce4-terminal
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -33,6 +43,12 @@
 
 %build
 %{__sed} -i 's,Categories.*,Categories=GTK;TerminalEmulator;,' Terminal.desktop.in
+%{__libtoolize}
+%{__aclocal}
+%{__autoheader}
+%{__automake}
+%{__autoconf}
+LDFLAGS="%{rpmldflags} -Wl,--as-needed"
 %configure
 %{__make}
 
@@ -47,6 +63,12 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+gtk-update-icon-cache -qf %{_datadir}/icons/hicolor
+
+%postun
+gtk-update-icon-cache -qf %{_datadir}/icons/hicolor
+
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog HACKING NEWS README THANKS
@@ -54,17 +76,34 @@
 %attr(755,root,root) %{_libdir}/TerminalHelp
 %{_datadir}/%{name}
 %{_desktopdir}/%{name}.desktop
-%{_docdir}/%{name}
 %{_iconsdir}/hicolor/*/apps/%{name}*
-%{_mandir}/man1/%{name}*
+%{_iconsdir}/hicolor/*/stock/navigation/*
 %{_pixmapsdir}/*
 
+%dir %{_docdir}/%{name}
+%{_docdir}/%{name}/C
+%{_docdir}/%{name}/*.css
+%lang(ja) %{_docdir}/%{name}/ja
+%{_mandir}/man1/%{name}*
+
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.15  2006/07/16 19:02:48  freetz
+- merged from DEVEL
+
+Revision 1.13.4.3  2006/07/16 19:01:50  freetz
+- 0.2.5.4beta2, updated deps, update icon cache, --as-needed support
+
+Revision 1.13.4.2  2006/05/17 03:20:17  charles
+- regenerate ac/am/lt; updated BRs
+
+Revision 1.13.4.1  2006/05/03 18:30:24  freetz
+- 0.2.5.1beta1, updated BR
+
 Revision 1.14  2006/05/21 22:17:45  hawk
 - release 3
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/Terminal.spec?r1=1.14&r2=1.15&f=u