Author: freetz Date: Sun Jul 16 19:58:23 2006 GMT Module: SPECS Tag: HEAD ---- Log message: - merged from DEVEL
---- Files affected: SPECS: xfce4-session.spec (1.25 -> 1.26) ---- Diffs: ================================================================ Index: SPECS/xfce4-session.spec diff -u SPECS/xfce4-session.spec:1.25 SPECS/xfce4-session.spec:1.26 --- SPECS/xfce4-session.spec:1.25 Fri Mar 17 17:09:08 2006 +++ SPECS/xfce4-session.spec Sun Jul 16 21:58:18 2006 @@ -1,24 +1,29 @@ # $Revision$, $Date$ -Summary: Xfce Session manager +# +# Conditional build: +%bcond_without static_libs # don't build static library +# +Summary: Xfce session manager Summary(pl): Zarządca sesji Xfce Name: xfce4-session -Version: 4.2.3 +Version: 4.3.90.2 Release: 1 License: GPL v2 Group: X11/Applications -Source0: http://hannelore.f1.fhtw-berlin.de/mirrors/xfce4/xfce-%{version}/src/%{name}-%{version}.tar.gz -# Source0-md5: e3685ace007f065eadbd7acce6fa61e8 +Source0: http://www.xfce.org/archive/xfce-%{version}/src/xfce4-session-%{version}.tar.bz2 +# Source0-md5: 32aecd2896ae290a0cbb0f67d4bc8a3a Patch0: %{name}-locale-names.patch URL: http://www.xfce.org/ BuildRequires: autoconf >= 2.50 BuildRequires: automake BuildRequires: gettext-devel +BuildRequires: intltool >= 0.35.0 BuildRequires: libtool BuildRequires: libxfce4mcs-devel >= %{version} BuildRequires: libxfcegui4-devel >= %{version} BuildRequires: pkgconfig BuildRequires: xfce-mcs-manager-devel >= %{version} -BuildRequires: xfce4-dev-tools +BuildRequires: xfce4-dev-tools >= %{version} Requires: %{name}-libs = %{version}-%{release} Requires: libxfce4mcs >= %{version} Requires: libxfcegui4 >= %{version} @@ -78,11 +83,13 @@ %build %{__libtoolize} -%{__aclocal} -I %{_datadir}/xfce4/dev-tools/m4macros +%{__aclocal} %{__autoheader} %{__automake} %{__autoconf} +LDFLAGS="%{rpmldflags} -Wl,--as-needed" %configure \ + %{!?with_static_libs:--disable-static} \ ICEAUTH=/usr/bin/iceauth # why libxfsm_4_2_la_LIBADD on Cygwin only??? %{__make} \ @@ -117,6 +124,7 @@ %attr(755,root,root) %{_libdir}/xfce4/splash/engines/*.so %dir %{_sysconfdir}/xdg/%{name} %{_sysconfdir}/xdg/%{name}/%{name}.rc +%{_datadir}/xfce4/tips %{_datadir}/themes/Default/balou %{_desktopdir}/*.desktop @@ -126,7 +134,7 @@ %docdir %{_datadir}/xfce4/doc %{_datadir}/xfce4/doc/C/* %lang(fr) %{_datadir}/xfce4/doc/fr/* -%lang(he) %{_datadir}/xfce4/doc/he/* +#%lang(he) %{_datadir}/xfce4/doc/he/* %files libs %defattr(644,root,root,755) @@ -139,9 +147,11 @@ %{_includedir}/xfce4/xfce4-session-* %{_pkgconfigdir}/xfce4-session-*.pc +%if %{with static_libs} %files static %defattr(644,root,root,755) %{_libdir}/libxfsm-*.a +%endif %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -149,6 +159,21 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.26 2006/07/16 19:58:18 freetz +- merged from DEVEL + +Revision 1.25.2.4 2006/07/16 19:57:44 freetz +- 4.3.90.2, updated deps, --as-needed support + +Revision 1.25.2.3 2006/05/17 04:51:55 charles +- without static_libs bcond + +Revision 1.25.2.2 2006/05/17 04:40:49 charles +- BR: intltool + +Revision 1.25.2.1 2006/05/10 21:01:11 freetz +- 4.3.90.1 + Revision 1.25 2006/03/17 16:09:08 megabajt - update for xorg (change path to iceauth) - R: xorg-app-iceauth ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/xfce4-session.spec?r1=1.25&r2=1.26&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
