packages: orage/orage.spec, xfce4-appfinder/xfce4-appfinder.spec, xfce4-set...
megabajt
megabajt at pld-linux.org
Wed Feb 16 20:03:58 CET 2011
Author: megabajt Date: Wed Feb 16 19:03:58 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- merged from DEVEL
---- Files affected:
packages/orage:
orage.spec (1.16 -> 1.17)
packages/xfce4-appfinder:
xfce4-appfinder.spec (1.33 -> 1.34)
packages/xfce4-settings:
xfce4-settings.spec (1.13 -> 1.14)
---- Diffs:
================================================================
Index: packages/orage/orage.spec
diff -u packages/orage/orage.spec:1.16 packages/orage/orage.spec:1.17
--- packages/orage/orage.spec:1.16 Fri Feb 4 19:23:58 2011
+++ packages/orage/orage.spec Wed Feb 16 20:03:53 2011
@@ -1,29 +1,28 @@
# $Revision$, $Date$
+%define xfce_version 4.8.0
Summary: Calendar for Xfce
Summary(pl.UTF-8): Kalendarz dla Xfce
Name: orage
-Version: 4.6.1
-Release: 2
+Version: 4.8.0
+Release: 1
License: GPL v2
Group: X11/Applications
-Source0: http://www.xfce.org/archive/xfce-%{version}/src/%{name}-%{version}.tar.bz2
-# Source0-md5: 24fa43dd86ec5af5a4766620fd972cf2
-URL: http://www.xfce.org/projects/orage/
-BuildRequires: autoconf >= 2.52
-BuildRequires: automake
+Source0: http://archive.xfce.org/src/apps/orage/4.8/%{name}-%{version}.tar.bz2
+# Source0-md5: cc6770036ddc690c2a361079fdae5d22
+URL: http://www.xfce.org/projects/orage
BuildRequires: dbus-glib-devel
BuildRequires: gettext-devel
BuildRequires: glib2-devel >= 1:2.12.4
-BuildRequires: intltool >= 0.35.0
-BuildRequires: libnotify-devel
-BuildRequires: libtool
-BuildRequires: libxfcegui4-devel >= %{version}
+BuildRequires: libical-devel >= 0.43
+BuildRequires: libnotify-devel >= 0.3.2
+BuildRequires: libxfce4ui-devel >= %{xfce_version}
BuildRequires: pkgconfig
-BuildRequires: rpmbuild(macros) >= 1.311
-BuildRequires: xfce4-dev-tools >= 4.4.0
-BuildRequires: xfce4-panel-devel >= %{version}
-Requires(post,postun): gtk-update-icon-cache
-Requires(post,postun): hicolor-icon-theme
+BuildRequires: popt-devel
+BuildRequires: rpmbuild(macros) >= 1.601
+BuildRequires: xfce4-dev-tools >= 4.8.0
+BuildRequires: xfce4-panel-devel >= %{xfce_version}
+Requires: gtk-update-icon-cache
+Requires: hicolor-icon-theme
Obsoletes: xfcalendar
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -43,12 +42,6 @@
%setup -q
%build
-%{__intltoolize}
-%{__libtoolize}
-%{__aclocal}
-%{__autoheader}
-%{__automake}
-%{__autoconf}
%configure \
--disable-static
@@ -60,6 +53,8 @@
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/locale/ur_PK
+
%find_lang %{name}
%clean
@@ -76,15 +71,18 @@
%doc AUTHORS ChangeLog NEWS README
%attr(755,root,root) %{_bindir}/globaltime
%attr(755,root,root) %{_bindir}/orage
-%attr(755,root,root) %{_libdir}/xfce4/panel-plugins/orageclock
+%attr(755,root,root) %{_bindir}/tz_convert
+%attr(755,root,root) %{_libdir}/xfce4/panel-plugins/xfce4-orageclock-plugin
%{_datadir}/orage
+%{_desktopdir}/globaltime.desktop
%{_desktopdir}/xfcalendar.desktop
%{_desktopdir}/xfce-xfcalendar-settings.desktop
%{_datadir}/dbus-1/services/org.xfce.calendar.service
%{_datadir}/dbus-1/services/org.xfce.orage.service
-%{_datadir}/xfce4/panel-plugins/orageclock.desktop
+%{_datadir}/xfce4/panel-plugins/xfce4-orageclock-plugin.desktop
%{_mandir}/man1/globaltime.1*
%{_mandir}/man1/orage.1*
+%{_mandir}/man1/tz_convert.1*
%{_iconsdir}/hicolor/*/*/*
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -93,8 +91,17 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.17 2011/02/16 19:03:53 megabajt
+- merged from DEVEL
+
+Revision 1.15.2.2 2011/02/14 17:37:04 megabajt
+- updated to 4.8.0
+
Revision 1.16 2011/02/04 18:23:58 wiget
- Requires(post,postun): gtk-update-icon-cache
+
+Revision 1.15.2.1 2010/11/15 10:21:57 baggins
+- 4.7.5
Revision 1.15 2009/04/27 08:04:34 adamg
- updated to 4.6.1
================================================================
Index: packages/xfce4-appfinder/xfce4-appfinder.spec
diff -u packages/xfce4-appfinder/xfce4-appfinder.spec:1.33 packages/xfce4-appfinder/xfce4-appfinder.spec:1.34
--- packages/xfce4-appfinder/xfce4-appfinder.spec:1.33 Fri Feb 4 19:24:08 2011
+++ packages/xfce4-appfinder/xfce4-appfinder.spec Wed Feb 16 20:03:53 2011
@@ -2,30 +2,31 @@
Summary: Appfinder for the Xfce Desktop Environment
Summary(pl.UTF-8): Wyszukiwarka aplikacji dla środowiska Xfce
Name: xfce4-appfinder
-Version: 4.6.2
-Release: 2
+Version: 4.8.0
+Release: 1
License: GPL
Group: X11/Applications
-Source0: http://www.xfce.org/archive/xfce-%{version}/src/%{name}-%{version}.tar.bz2
-# Source0-md5: 7752e43578b821e35010bcd3762da166
-URL: http://www.xfce.org/projects/xfce4-appfinder/
-BuildRequires: Thunar-devel >= 1.0.0
+Source0: http://archive.xfce.org/src/xfce/xfce4-appfinder/4.8/%{name}-%{version}.tar.bz2
+# Source0-md5: fb4797ef91b90d111b989e98c3e000e0
+URL: http://www.xfce.org/projects/xfce4-appfinder
BuildRequires: autoconf >= 2.50
BuildRequires: automake
+BuildRequires: garcon-devel >= 0.1.3
BuildRequires: gettext-devel
-BuildRequires: glib2-devel >= 1:2.12.0
-BuildRequires: gtk+2-devel >= 2:2.10.6
+BuildRequires: glib2-devel >= 1:2.16.0
+BuildRequires: gtk+2-devel >= 2:2.14.0
BuildRequires: intltool
BuildRequires: libtool
-BuildRequires: libxfce4menu-devel >= %{version}
-BuildRequires: libxfce4util-devel >= %{version}
-BuildRequires: libxfcegui4-devel >= %{version}
+BuildRequires: libxfce4ui-devel >= 4.8.0
+BuildRequires: libxfce4util-devel >= 4.8.0
BuildRequires: pkgconfig
-BuildRequires: rpmbuild(macros) >= 1.311
-BuildRequires: xfce4-dev-tools >= 4.6.0
-BuildRequires: xfconf-devel >= %{version}
-Requires(post,postun): gtk-update-icon-cache
-Requires(post,postun): hicolor-icon-theme
+BuildRequires: rpmbuild(macros) >= 1.601
+BuildRequires: xfce4-dev-tools >= 4.8.0
+BuildRequires: xfconf-devel >= 4.8.0
+Requires: garcon >= 0.1.3
+Requires: gtk-update-icon-cache
+Requires: hicolor-icon-theme
+Requires: xfconf >= 4.8.0
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -44,7 +45,9 @@
%{__autoheader}
%{__automake}
%{__autoconf}
-%configure
+%configure \
+ --disable-silent-rules
+
%{__make}
%install
@@ -53,7 +56,7 @@
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-rm -r $RPM_BUILD_ROOT%{_datadir}/locale/ur_PK
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/locale/ur_PK
%find_lang %{name}
@@ -79,6 +82,12 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.34 2011/02/16 19:03:53 megabajt
+- merged from DEVEL
+
+Revision 1.30.2.2 2011/02/07 17:19:23 megabajt
+- updated to 4.8.0
+
Revision 1.33 2011/02/04 18:24:08 wiget
- Requires(post,postun): gtk-update-icon-cache
@@ -87,6 +96,9 @@
Revision 1.31 2010/11/14 12:41:31 baggins
- 4.6.2
+
+Revision 1.30.2.1 2010/11/14 12:15:26 baggins
+- 4.7.1, XFCE 4.8pre1
Revision 1.30 2009/04/27 07:46:33 adamg
- updated to 4.6.1
================================================================
Index: packages/xfce4-settings/xfce4-settings.spec
diff -u packages/xfce4-settings/xfce4-settings.spec:1.13 packages/xfce4-settings/xfce4-settings.spec:1.14
--- packages/xfce4-settings/xfce4-settings.spec:1.13 Sun Nov 14 17:22:31 2010
+++ packages/xfce4-settings/xfce4-settings.spec Wed Feb 16 20:03:53 2011
@@ -1,34 +1,35 @@
# $Revision$, $Date$
-%define xfce_version 4.6.2
+%define xfce_version 4.8.0
Summary: Settings manager for the Xfce desktop environment
Summary(pl.UTF-8): Menadżer ustawień dla środowiska Xfce
Name: xfce4-settings
-Version: 4.6.5
+Version: 4.8.1
Release: 1
License: GPL v2
Group: X11/Applications
-Source0: http://www.xfce.org/archive/xfce-%{xfce_version}/src/%{name}-%{version}.tar.bz2
-# Source0-md5: f988cb732913b5fbc115ad7105d2231e
+Source0: http://archive.xfce.org/src/xfce/xfce4-settings/4.8/%{name}-%{version}.tar.bz2
+# Source0-md5: 0097476baadcc9bc9841d6b8e687b8eb
Patch0: %{name}-default-icon-theme.patch
URL: http://www.xfce.org/projects/xfce4-settings/
BuildRequires: autoconf >= 2.50
BuildRequires: automake >= 1:1.8
BuildRequires: dbus-glib-devel >= 0.34
-BuildRequires: exo-devel >= 0.3.100
+BuildRequires: exo-devel >= 0.6.0
BuildRequires: gettext-devel
-BuildRequires: glib2-devel >= 1:2.12.0
-BuildRequires: gtk+2-devel >= 2:2.10.6
+BuildRequires: glib2-devel >= 1:2.16.0
+BuildRequires: gtk+2-devel >= 2:2.14.0
BuildRequires: intltool
-BuildRequires: libglade2-devel >= 1:2.6.0
BuildRequires: libnotify-devel
BuildRequires: libtool
-BuildRequires: libwnck-devel >= 2.12.0
+BuildRequires: libxfce4ui-devel >= %{xfce_version}
BuildRequires: libxfce4util-devel >= %{xfce_version}
-BuildRequires: libxfcegui4-devel >= %{xfce_version}
BuildRequires: libxklavier-devel
BuildRequires: pkgconfig
-BuildRequires: xfce4-dev-tools >= 4.6.0
+BuildRequires: xfce4-dev-tools >= %{xfce_version}
BuildRequires: xfconf-devel >= %{xfce_version}
+BuildRequires: xorg-lib-libXcursor-devel >= 1.1.0
+BuildRequires: xorg-lib-libXi-devel
+BuildRequires: xorg-proto-inputproto-devel >= 1.4.0
Requires: xfconf >= %{xfce_version}
Obsoletes: xfce-mcs-manager
Obsoletes: xfce-mcs-plugins
@@ -53,7 +54,9 @@
%{__autoconf}
%{__autoheader}
%{__automake}
-%configure
+%configure \
+ --disable-silent-rules
+
%{__make}
%install
@@ -62,7 +65,7 @@
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-rm -r $RPM_BUILD_ROOT%{_datadir}/locale/ur_PK
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/locale/ur_PK
%find_lang %{name}
@@ -97,11 +100,20 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.14 2011/02/16 19:03:53 megabajt
+- merged from DEVEL
+
+Revision 1.11.2.2 2011/02/05 23:47:41 megabajt
+- updated to 4.8.1
+
Revision 1.13 2010/11/14 16:22:31 baggins
- no ur_PK locale
Revision 1.12 2010/11/14 12:48:24 baggins
- 4.6.5, XFCE 4.6.2
+
+Revision 1.11.2.1 2010/11/14 12:25:11 baggins
+- 4.7.4, XFCE 4.8pre1
Revision 1.11 2010/05/22 21:05:08 sparky
- BR: pkgconfig
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/orage/orage.spec?r1=1.16&r2=1.17&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xfce4-appfinder/xfce4-appfinder.spec?r1=1.33&r2=1.34&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xfce4-settings/xfce4-settings.spec?r1=1.13&r2=1.14&f=u
More information about the pld-cvs-commit
mailing list