1:46 p.m.
Author: mtasaka
Update of /cvs/free/rpms/cairo-dock/F-16
In directory se02.es.rpmfusion.net:/tmp/cvs-serv13173
Modified Files:
.cvsignore cairo-dock.spec sources
Log Message:
* Mon Dec 12 2011 Mamoru Tasaka <mtasaka(a)fedoraproject.org> - 2.4.0.2-1
- 2.4.0-2
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/F-16/.cvsignore,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- .cvsignore 27 Jun 2011 15:34:03 -0000 1.44
+++ .cvsignore 13 Dec 2011 13:46:25 -0000 1.45
@@ -1,2 +1,2 @@
-cairo-dock-2.3.0~3.tar.gz
-cairo-dock-plugins-2.3.0~3.tar.gz
+cairo-dock-2.4.0~2.tar.gz
+cairo-dock-plugins-2.4.0~2.tar.gz
Index: cairo-dock.spec
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/F-16/cairo-dock.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- cairo-dock.spec 27 Sep 2011 22:15:52 -0000 1.63
+++ cairo-dock.spec 13 Dec 2011 13:46:25 -0000 1.64
@@ -16,11 +16,11 @@
# Set the below to 1 when building unstable plug-ins
%global build_other 1
-%global urlver 2.3
-%global mainver 2.3.0
+%global urlver 2.4
+%global mainver 2.4.0
#%%define betaver 0rc1
-%global postver_c 3
-%global postver_p 3
+%global postver_c 2
+%global postver_p 2
%global rpmver_c %{mainver}%{?postver_c:.%postver_c}
%global rpmver_p %{mainver}%{?postver_p:.%postver_p}
@@ -29,7 +29,7 @@
%global build_webkit 1
%global build_xfce 1
-%global fedora_main_rel 2
+%global fedora_main_rel 1
%global fedora_rel %{?pre_release:0.}%{fedora_main_rel}%{?betaver:.%betaver}
@@ -54,7 +54,7 @@
Name: cairo-dock
Version: %{rpmver_c}
-Release: %{rpmrel}.1
+Release: %{rpmrel}
Summary: Light eye-candy fully themable animated dock
Group: User Interface/Desktops
@@ -89,7 +89,11 @@
# For plug-ins
BuildRequires: alsa-lib-devel
+BuildRequires: fftw3-devel
+%if 0%{?fedora} < 16
+# This is gnome2
BuildRequires: gnome-menus-devel
+%endif
BuildRequires: gnome-vfs2-devel
BuildRequires: libexif-devel
BuildRequires: libgnomeui-devel
@@ -98,6 +102,9 @@
BuildRequires: libXrandr-devel
BuildRequires: libXxf86vm-devel
BuildRequires: libzeitgeist-devel
+BuildRequires: pulseaudio-libs-devel
+#BuildRequires: qt4-devel
+BuildRequires: upower-devel
BuildRequires: vte-devel
# Not shown in .pc files
# Make it sure that cairo-dock is rebuilt against
@@ -352,6 +359,18 @@
%if %{skip_main_build} < 1
+# ZZZ GLib inclusion
+# From GLib 2.31, _some_ Glib headers were made not to be included
+# directly, however still gi18n.h, gstdio.h and so on have to be
+# included separately
+%if 0%{?fedora} >= 17
+export CFLAGS="%optflags -DGLIB_COMPILATION"
+export CXXFLAGS="%optflags -DGLIB_COMPILATION"
+%else
+export CFLAGS="%optflags"
+export CXXFLAGS="%optflags"
+%endif
+
## rpath issue needs investigating
%cmake -DCMAKE_SKIP_RPATH:BOOL=ON .
%{__make} %{?_smp_mflags} || status=$((status+1))
@@ -365,12 +384,16 @@
%endif
-export CFLAGS="%optflags -I$TOPDIR/TMPINSTDIR%{_includedir}/cairo-dock"
+%if 1
+export CFLAGS="$CFLAGS -I$TOPDIR/TMPINSTDIR%{_includedir}/cairo-dock"
export CFLAGS="$CFLAGS
-I$TOPDIR/TMPINSTDIR%{_includedir}/cairo-dock/cairo-dock"
export CFLAGS="$CFLAGS
-I$TOPDIR/TMPINSTDIR%{_includedir}/cairo-dock/icon-factory"
-export CXXFLAGS="%optflags -I$TOPDIR/TMPINSTDIR%{_includedir}/cairo-dock"
+export CFLAGS="$CFLAGS -I$TOPDIR/TMPINSTDIR%{_includedir}/cairo-dock/gldit"
+export CXXFLAGS="$CFLAGS -I$TOPDIR/TMPINSTDIR%{_includedir}/cairo-dock"
export CXXFLAGS="$CXXFLAGS
-I$TOPDIR/TMPINSTDIR%{_includedir}/cairo-dock/cairo-dock"
export CXXFLAGS="$CXXFLAGS
-I$TOPDIR/TMPINSTDIR%{_includedir}/cairo-dock/icon-factory"
+export CXXFLAGS="$CXXFLAGS
-I$TOPDIR/TMPINSTDIR%{_includedir}/cairo-dock/gldit"
+%endif
export LD_LIBRARY_PATH=$TOPDIR/TMPINSTDIR%{_libdir}
export PKG_CONFIG_PATH=$TOPDIR/TMPINSTDIR%{_libdir}/pkgconfig:${PKG_CONFIG_PATH}
@@ -516,15 +539,14 @@
%dir %{_datadir}/%{name}/
%{_datadir}/%{name}/*.conf
%{_datadir}/%{name}/*.desktop
-%{_datadir}/%{name}/*.png
%{_datadir}/%{name}/*.svg
-%{_datadir}/%{name}/*.sh
-%{_datadir}/%{name}/*.xpm
+%{_datadir}/%{name}/images/
%{_datadir}/%{name}/*view
#%%{_datadir}/%{name}/emblems/
%{_datadir}/%{name}/explosion/
%{_datadir}/%{name}/gauges/
%{_datadir}/%{name}/icons/
+%{_datadir}/%{name}/scripts/
%dir %{_datadir}/%{name}/themes/
%dir %{_datadir}/%{name}/plug-ins/
%{_datadir}/%{name}/themes/_default_/
@@ -572,6 +594,7 @@
%if %{build_python} > 0
%files python
%defattr(-,root,root,-)
+%{python_sitelib}/CairoDock.py*
%{python_sitelib}/CDApplet.py*
%{python_sitelib}/CDBashApplet.py*
%{python_sitelib}/*.egg-info
@@ -590,6 +613,12 @@
%{_libdir}/pkgconfig/*.pc
%changelog
+* Mon Dec 12 2011 Mamoru Tasaka <mtasaka(a)fedoraproject.org> - 2.4.0.2-1
+- 2.4.0-2
+
+* Tue Nov 8 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 2.3.0.3-3
+- Rebuilt
+
* Wed Sep 28 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 2.3.0.3-2.1
- Rebuilt for libgnome-menu
Index: sources
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/F-16/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- sources 27 Jun 2011 15:34:03 -0000 1.46
+++ sources 13 Dec 2011 13:46:25 -0000 1.47
@@ -1,2 +1,2 @@
-e838dec553960adc443a312162ceeb9a cairo-dock-2.3.0~3.tar.gz
-b923a1cb934c5935c64019e40f15aa9a cairo-dock-plugins-2.3.0~3.tar.gz
+2407e97b74a97c383dd7ef4f0c83a206 cairo-dock-2.4.0~2.tar.gz
+38cba2c63c815e359a5d86cba0d209df cairo-dock-plugins-2.4.0~2.tar.gz