SPECS: libxfce4mcs.spec, libxfce4util.spec, libxfcegui4.spec - mer...
freetz
freetz at pld-linux.org
Sun Jul 16 13:29:06 CEST 2006
Author: freetz Date: Sun Jul 16 11:29:06 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- merged from DEVEL
---- Files affected:
SPECS:
libxfce4mcs.spec (1.45 -> 1.46) , libxfce4util.spec (1.37 -> 1.38) , libxfcegui4.spec (1.51 -> 1.52)
---- Diffs:
================================================================
Index: SPECS/libxfce4mcs.spec
diff -u SPECS/libxfce4mcs.spec:1.45 SPECS/libxfce4mcs.spec:1.46
--- SPECS/libxfce4mcs.spec:1.45 Thu Mar 16 21:28:08 2006
+++ SPECS/libxfce4mcs.spec Sun Jul 16 13:29:01 2006
@@ -2,12 +2,12 @@
Summary: Multi-channel settings management support for Xfce
Summary(pl): Obsługa zarządzania ustawieniami wielokanałowymi dla Xfce
Name: libxfce4mcs
-Version: 4.2.3
+Version: 4.3.90.2
Release: 1
License: LGPL v2
Group: Libraries
-Source0: http://hannelore.f1.fhtw-berlin.de/mirrors/xfce4/xfce-%{version}/src/%{name}-%{version}.tar.gz
-# Source0-md5: b3244024bea7f5756f4c0f541bc24128
+Source0: http://www.xfce.org/archive/xfce-%{version}/src/%{name}-%{version}.tar.bz2
+# Source0-md5: 71c8280e256882563f57a273b8a5184a
URL: http://www.xfce.org/
BuildRequires: autoconf >= 2.50
BuildRequires: automake
@@ -16,7 +16,7 @@
BuildRequires: libxfce4util-devel >= %{version}
BuildRequires: pkgconfig >= 1:0.9.0
BuildRequires: rpmbuild(macros) >= 1.98
-BuildRequires: xfce4-dev-tools
+BuildRequires: xfce4-dev-tools >= 4.3.90.2
BuildRequires: xorg-lib-libX11-devel
Requires: libxfce4util >= %{version}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -59,10 +59,11 @@
%build
%{__libtoolize}
-%{__aclocal} -I %{_datadir}/xfce4/dev-tools/m4macros
+%{__aclocal}
%{__autoheader}
%{__automake}
%{__autoconf}
+LDFLAGS="%{rpmldflags} -Wl,--as-needed"
%configure \
--with-html-dir=%{_gtkdocdir}
%{__make}
@@ -90,7 +91,7 @@
%{_libdir}/lib*.la
%{_includedir}/xfce4/libxfce4mcs
%{_pkgconfigdir}/*.pc
-%{_gtkdocdir}/libxfce4mcs
+#%{_gtkdocdir}/libxfce4mcs
%files static
%defattr(644,root,root,755)
@@ -102,6 +103,16 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.46 2006/07/16 11:29:01 freetz
+- merged from DEVEL
+
+Revision 1.45.2.2 2006/07/16 11:27:19 freetz
+- 4.3.90.2, use common aclocal dir for m4 macros, updated deps, --as-needed
+ support
+
+Revision 1.45.2.1 2006/04/18 19:32:33 troll
+- updated to 4.3.90.1 (4.4 beta 1)
+
Revision 1.45 2006/03/16 20:28:08 megabajt
- modular xorg deps
================================================================
Index: SPECS/libxfce4util.spec
diff -u SPECS/libxfce4util.spec:1.37 SPECS/libxfce4util.spec:1.38
--- SPECS/libxfce4util.spec:1.37 Thu Nov 17 05:57:48 2005
+++ SPECS/libxfce4util.spec Sun Jul 16 13:29:01 2006
@@ -1,23 +1,26 @@
# $Revision$, $Date$
+#
# Conditional build:
%bcond_without static_libs # don't build static library
#
Summary: Utility library for the Xfce desktop environment
Summary(pl): Biblioteka narzędziowa dla środowiska Xfce
Name: libxfce4util
-Version: 4.2.3.2
+Version: 4.3.90.2
Release: 1
License: BSD, LGPL
Group: Libraries
-Source0: http://hannelore.f1.fhtw-berlin.de/mirrors/xfce4/xfce-%{version}/src/%{name}-%{version}.tar.gz
-# Source0-md5: 2d312ba48da612501d6776f8b4a65797
+Source0: http://www.xfce.org/archive/xfce-%{version}/src/%{name}-%{version}.tar.bz2
+# Source0-md5: 1fe13bf71e814aa5d512e772c011f234
URL: http://www.xfce.org/
BuildRequires: autoconf >= 2.50
BuildRequires: automake
-BuildRequires: glib2-devel >= 2.2.0
+BuildRequires: glib2-devel >= 1:2.12.0
+BuildRequires: gtk-doc-automake
BuildRequires: libtool
BuildRequires: pkgconfig >= 1:0.9.0
-Requires: glib2 >= 2.2.0
+BuildRequires: xfce4-dev-tools >= 4.3.90.2
+Requires: glib2 >= 1:2.12.0
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -31,8 +34,7 @@
Summary(pl): Pliki nagłówkowe biblioteki libxfce4util
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
-Requires: glib2-devel >= 2.2.0
-Requires: gtk-doc-common
+Requires: glib2-devel >= 1:2.12.0
%description devel
Development files for the libxfce4util library.
@@ -69,10 +71,11 @@
%build
%{__libtoolize}
-%{__aclocal} -I m4
+%{__aclocal}
%{__autoheader}
%{__automake}
%{__autoconf}
+LDFLAGS="%{rpmldflags} -Wl,--as-needed"
%configure \
--with-html-dir=%{_gtkdocdir} \
%{!?with_static_libs:--disable-static}
@@ -81,7 +84,12 @@
%install
rm -rf $RPM_BUILD_ROOT
-%{__make} install DESTDIR=$RPM_BUILD_ROOT
+%{__make} install \
+ DESTDIR=$RPM_BUILD_ROOT
+
+install -d $RPM_BUILD_ROOT%{_datadir}/xfce4
+
+%find_lang %{name}
%clean
rm -rf $RPM_BUILD_ROOT
@@ -89,7 +97,7 @@
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
-%files
+%files -f %{name}.lang
%defattr(644,root,root,755)
%doc AUTHORS ChangeLog COPYING README
%attr(755,root,root) %{_libdir}/lib*.so.*.*
@@ -101,9 +109,7 @@
%{_libdir}/lib*.la
%dir %{_includedir}/xfce4
%{_includedir}/xfce4/libxfce4util
-%{_datadir}/xfce4/m4
%{_pkgconfigdir}/*.pc
-%{_gtkdocdir}/libxfce4util
%if %{with static_libs}
%files static
@@ -121,6 +127,37 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.38 2006/07/16 11:29:01 freetz
+- merged from DEVEL
+
+Revision 1.37.2.9 2006/07/16 11:27:19 freetz
+- 4.3.90.2, use common aclocal dir for m4 macros, updated deps, --as-needed
+ support
+
+Revision 1.37.2.8 2006/05/19 01:53:42 undefine
+- rel 4.. fix (sleep!)
+
+Revision 1.37.2.7 2006/05/19 01:42:46 undefine
+- create dir :> (and sleep())
+
+Revision 1.37.2.6 2006/05/19 01:38:19 undefine
+- back %dir %{_datadir}/xfce4
+
+Revision 1.37.2.5 2006/05/17 02:20:05 charles
+- BR: gtk-doc-automake
+
+Revision 1.37.2.4 2006/04/18 21:44:06 freetz
+- really cleaned up
+
+Revision 1.37.2.3 2006/04/18 21:32:18 freetz
+- typo
+
+Revision 1.37.2.2 2006/04/18 21:26:58 freetz
+- updated BR, fixed build, cleaned up
+
+Revision 1.37.2.1 2006/04/18 19:20:43 troll
+- updated to 4.3.90.1 (4.4 beta 1)
+
Revision 1.37 2005/11/17 04:57:48 charles
- updated to 4.2.3.2
================================================================
Index: SPECS/libxfcegui4.spec
diff -u SPECS/libxfcegui4.spec:1.51 SPECS/libxfcegui4.spec:1.52
--- SPECS/libxfcegui4.spec:1.51 Thu Nov 17 00:42:16 2005
+++ SPECS/libxfcegui4.spec Sun Jul 16 13:29:01 2006
@@ -1,31 +1,32 @@
# $Revision$, $Date$
+#
# Conditional build:
%bcond_without static_libs # don't build static library
#
Summary: Various GTK+ widgets for Xfce
Summary(pl): Różne widgety GTK+ dla Xfce
Name: libxfcegui4
-Version: 4.2.3
+Version: 4.3.90.2
Release: 1
License: LGPL v2
Group: Libraries
-Source0: http://hannelore.f1.fhtw-berlin.de/mirrors/xfce4/xfce-%{version}/src/%{name}-%{version}.tar.gz
-# Source0-md5: 5d2bae78c5ef66e914ae7a930bbdeb57
+Source0: http://www.xfce.org/archive/xfce-%{version}/src/%{name}-%{version}.tar.bz2
+# Source0-md5: 901f299f3da72c25b6667b40a13a45d9
URL: http://www.xfce.org/
BuildRequires: autoconf >= 2.50
BuildRequires: automake
BuildRequires: dbh-devel >= 1.0
BuildRequires: gettext-devel
BuildRequires: gtk-doc-automake
-BuildRequires: gtk+2-devel >= 2:2.6.0
+BuildRequires: gtk+2-devel >= 2:2.10.0
BuildRequires: libtool
BuildRequires: libxfce4util-devel >= %{version}
-BuildRequires: libxml2-devel >= 2.4.0
+BuildRequires: libxml2-devel >= 1:2.6.26
BuildRequires: pkgconfig >= 1:0.9.0
BuildRequires: rpmbuild(macros) >= 1.98
-BuildRequires: startup-notification-devel >= 0.5
-BuildRequires: xfce4-dev-tools
-Requires: gtk+2 >= 2:2.6.0
+BuildRequires: startup-notification-devel >= 0.8
+BuildRequires: xfce4-dev-tools >= 4.3.90.2
+Requires: gtk+2 >= 2:2.10.0
Requires: libxfce4util >= %{version}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -40,10 +41,10 @@
Summary(pl): Pliki nagłówkowe biblioteki libxfcegui4
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
-Requires: gtk+2-devel >= 2:2.6.0
+Requires: gtk+2-devel >= 2:2.10.0
Requires: gtk-doc-common
Requires: libxfce4util-devel >= %{version}
-Requires: startup-notification-devel >= 0.5
+Requires: startup-notification-devel >= 0.8
%description devel
Development files for the libxfcegui4 library.
@@ -68,10 +69,11 @@
%build
%{__libtoolize}
-%{__aclocal} -I %{_datadir}/xfce4/dev-tools/m4macros
+%{__aclocal}
%{__autoheader}
%{__automake}
%{__autoconf}
+LDFLAGS="%{rpmldflags} -Wl,--as-needed"
%configure \
--enable-xinerama \
--with-html-dir=%{_gtkdocdir} \
@@ -102,12 +104,12 @@
%defattr(644,root,root,755)
%doc AUTHORS ChangeLog
%attr(755,root,root) %{_libdir}/lib*.so.*.*
-%dir %{_libdir}/xfce4
-%dir %{_libdir}/xfce4/modules
+#%dir %{_libdir}/xfce4
+#%dir %{_libdir}/xfce4/modules
# why -avoid-version only on Cygwin?
-%attr(755,root,root) %{_libdir}/xfce4/modules/lib*.so*
-%{_datadir}/xfce4/mime
-%{_datadir}/xfce4/hicolor-index.theme
+#%attr(755,root,root) %{_libdir}/xfce4/modules/lib*.so*
+#%{_datadir}/xfce4/mime
+#%{_datadir}/xfce4/hicolor-index.theme
%{_datadir}/xfce4/xfce-svg-test.svg
%files devel
@@ -115,9 +117,9 @@
%attr(755,root,root) %{_libdir}/lib*.so
%{_libdir}/lib*.la
%{_includedir}/xfce4/libxfcegui4
-%{_includedir}/xfce4/xfce4-modules
+#%{_includedir}/xfce4/xfce4-modules
%{_pkgconfigdir}/*.pc
-%{_gtkdocdir}/libxfcegui4
+#%{_gtkdocdir}/libxfcegui4
%if %{with static_libs}
%files static
@@ -131,6 +133,16 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.52 2006/07/16 11:29:01 freetz
+- merged from DEVEL
+
+Revision 1.51.2.2 2006/07/16 11:27:19 freetz
+- 4.3.90.2, use common aclocal dir for m4 macros, updated deps, --as-needed
+ support
+
+Revision 1.51.2.1 2006/04/18 19:46:22 troll
+- updated to 4.3.90.1 (4.4 beta 1)
+
Revision 1.51 2005/11/16 23:42:16 charles
- BR: rpmbuild(macros) >= 1.98 for %{_gtkdocdir}
- sorted BRs
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/libxfce4mcs.spec?r1=1.45&r2=1.46&f=u
http://cvs.pld-linux.org/SPECS/libxfce4util.spec?r1=1.37&r2=1.38&f=u
http://cvs.pld-linux.org/SPECS/libxfcegui4.spec?r1=1.51&r2=1.52&f=u
More information about the pld-cvs-commit
mailing list