5:54 p.m.
Author: mtasaka
Update of /cvs/free/rpms/cairo-dock/F-12
In directory se02.es.rpmfusion.net:/tmp/cvs-serv22791/F-12
Modified Files:
.cvsignore cairo-dock.spec sources
Added Files:
cairo-dock-2.1.3.2-DSO.patch
Removed Files:
cairo-dock-plugins-2.1.2.4-showDesklets.patch
xorg-x11-proto-devel-workaround-bz505774.patch
Log Message:
* Fri Feb 12 2010 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp> - 2.1.3.2-1
- 2.1.3-2
cairo-dock-2.1.3.2-DSO.patch:
configure.ac | 2 ++
1 file changed, 2 insertions(+)
--- NEW FILE cairo-dock-2.1.3.2-DSO.patch ---
--- cairo-dock-2.1.3-2/configure.ac.debug 2010-02-07 23:15:52.000000000 +0900
+++ cairo-dock-2.1.3-2/configure.ac 2010-02-12 02:22:45.000000000 +0900
@@ -35,6 +35,8 @@
# Checks for library functions.
# AC_CHECK_FUNCS([sscanf])
+AC_CHECK_LIB(m,sin)
+
PKG_CHECK_MODULES(PACKAGE, "gtk+-2.0 gthread-2.0 cairo librsvg-2.0 dbus-1
dbus-glib-1 libxml-2.0 gtkglext-1.0 xrender")
AC_ARG_ENABLE(xextend,
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/F-12/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore 17 Dec 2009 20:53:01 -0000 1.32
+++ .cvsignore 11 Feb 2010 17:53:32 -0000 1.33
@@ -1,3 +1,2 @@
-cairo-dock-2.1.2-4.tar.gz
-cairo-dock-plugins-2.1.2-4.tar.gz
-cairo-dock-plugins-2.1.2.4-missingfiles.tar.gz
+cairo-dock-2.1.3-2.tar.gz
+cairo-dock-plugins-2.1.3-2.tar.gz
Index: cairo-dock.spec
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/F-12/cairo-dock.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- cairo-dock.spec 17 Dec 2009 20:53:01 -0000 1.41
+++ cairo-dock.spec 11 Feb 2010 17:53:32 -0000 1.42
@@ -17,9 +17,9 @@
%global build_other 1
%global urlver 2.1
-%global mainver 2.1.2
+%global mainver 2.1.3
%undefine betaver
-%global postver 4
+%global postver 2
%global build_webkit 1
%global build_xfce 1
@@ -50,14 +50,14 @@
%endif
# Temporarily
# pulled from plug-ins 2.1.x branch rev 1449
-Source10: cairo-dock-plugins-2.1.2.4-missingfiles.tar.gz
+#Source10: cairo-dock-plugins-2.1.2.4-missingfiles.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# plug-ins specific patches
Patch100: cairo-dock-rev1677-stacks.patch
-Patch101: cairo-dock-plugins-2.1.2.4-showDesklets.patch
+Patch101: cairo-dock-2.1.3.2-DSO.patch
-# For patch101
+# Patch101 needs autotool
#%%if ! %{released}
BuildRequires: automake
BuildRequires: libtool
@@ -86,6 +86,7 @@
BuildRequires: libexif-devel
BuildRequires: libgnomeui-devel
BuildRequires: libxklavier-devel
+BuildRequires: libXrandr-devel
BuildRequires: libXxf86vm-devel
BuildRequires: vte-devel
# Not shown in .pc files
@@ -177,13 +178,6 @@
%endif
###
-###
-# Temporarily
-cd plug-ins
-gzip -dc %{SOURCE10} | tar xf -
-cd ..
-###
-
%if 0
find . -type d -name \.svn | sort -r | xargs %{__rm} -rf
find . -type d -name \*CVS\* | sort -r | xargs %{__rm} -rf
@@ -195,6 +189,7 @@
cd cairo-dock
# Patch
+%patch101 -p1 -b .dso
# permission
for dir in */
@@ -213,6 +208,10 @@
autoreconf -i -f
%endif
+# For Patch101
+autoreconf -i -f
+
+
# desktop file
%{__sed} -i.icon \
-e 's|Icon=\*|Icon=cairo-dock|' \
@@ -229,9 +228,6 @@
# source code fix
-# showDesklets
-%patch101 -p0 -b .miss
-
# stacks: directory fix
%if 0%{?released} < 1
%patch100 -p0 -b .compile
@@ -261,12 +257,6 @@
%{__sed} -i.1 -e '\@po/@d' Subdirs.list
fi
-## Patch101 needs autotools
-## Call here
-autoreconf -fi
-##
-##
-
for dir in */
do
skip=0
@@ -337,9 +327,7 @@
%configure \
--enable-gio-in-gmenu \
--enable-network-monitor \
- --enable-rssreader \
--enable-scooby-do \
- --enable-show-desklets
# Workaround to avoid endless loop on po/
@@ -596,6 +584,12 @@
%{_libdir}/pkgconfig/*.pc
%changelog
+* Fri Feb 12 2010 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp> - 2.1.3.2-1
+- 2.1.3-2
+
+* Sun Jan 17 2010 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp>
+- F-13: Rebuild for libxklavier soname bump
+
* Fri Dec 18 2009 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp> - 2.1.2.4-1
- 2.1.2-4
Index: sources
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/F-12/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sources 17 Dec 2009 20:53:01 -0000 1.34
+++ sources 11 Feb 2010 17:53:32 -0000 1.35
@@ -1,3 +1,2 @@
-23815db69c97e751244bbef4a9882233 cairo-dock-2.1.2-4.tar.gz
-920d12c052a3c4a5be8a43a33c718d9b cairo-dock-plugins-2.1.2-4.tar.gz
-04a3dcc316b37f8880625b0cb0b46784 cairo-dock-plugins-2.1.2.4-missingfiles.tar.gz
+e432c2623a052efbe2b3daffdfbf7754 cairo-dock-2.1.3-2.tar.gz
+7b02ee33d0b1c08d212c8f29e009d336 cairo-dock-plugins-2.1.3-2.tar.gz
--- cairo-dock-plugins-2.1.2.4-showDesklets.patch DELETED ---
--- xorg-x11-proto-devel-workaround-bz505774.patch DELETED ---