Author: mtasaka
Update of /cvs/free/rpms/cairo-dock/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv4041
Modified Files:
.cvsignore cairo-dock.spec sources
Log Message:
* Mon Dec 1 2014 Mamoru TASAKA <mtasaka(a)fedoraproject.org> - 3.4.0-1
- 3.4.0
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/devel/.cvsignore,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- .cvsignore 16 Jun 2014 03:08:58 -0000 1.50
+++ .cvsignore 1 Dec 2014 05:19:45 -0000 1.51
@@ -1,2 +1,2 @@
-cairo-dock-3.3.2.tar.gz
-cairo-dock-plugins-3.3.2.tar.gz
+cairo-dock-3.4.0.tar.gz
+cairo-dock-plugins-3.4.0.tar.gz
Index: cairo-dock.spec
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/devel/cairo-dock.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- cairo-dock.spec 24 Aug 2014 14:03:46 -0000 1.75
+++ cairo-dock.spec 1 Dec 2014 05:19:45 -0000 1.76
@@ -16,8 +16,8 @@
# Set the below to 1 when building unstable plug-ins
%global build_other 1
-%global urlver 3.3
-%global mainver 3.3.2
+%global urlver 3.4
+%global mainver 3.4.0
#%%define betaver 0rc1
#%%global postver_c 2
#%%global postver_p 2.1
@@ -29,7 +29,7 @@
%global build_webkit 1
%global build_xfce 1
-%global fedora_main_rel 3
+%global fedora_main_rel 1
%global fedora_rel %{?pre_release:0.}%{fedora_main_rel}%{?betaver:.%betaver}
@@ -66,10 +66,6 @@
Source0:
http://launchpad.net/cairo-dock-core/%{urlver}/%{mainver}%{?betaver:-%bet...
Source2:
http://launchpad.net/cairo-dock-plug-ins/%{urlver}/%{mainver}%{?betaver:-...
%endif
-#
http://bazaar.launchpad.net/~cairo-dock-team/cairo-dock-plug-ins/plug-ins...
-#
http://bazaar.launchpad.net/~cairo-dock-team/cairo-dock-plug-ins/plug-ins...
-Patch0: cairo-dock-plugins-3.3.2-upower-099-r3083-modified.patch
-Patch1: cairo-dock-plugins-3.3.2-upower-099-r3084-modified.patch
BuildRequires: cmake
@@ -89,6 +85,7 @@
BuildRequires: libxml2-devel
BuildRequires: libXtst-devel
BuildRequires: libGLU-devel
+BuildRequires: pkgconfig(wayland-client)
BuildRequires: perl(XML::Parser)
# For plug-ins
@@ -106,6 +103,7 @@
BuildRequires: vte3-devel
BuildRequires: libetpan-devel
BuildRequires: lm_sensors-devel
+BuildRequires: pkgconfig(indicator3-0.4)
# For plug-ins-xfce
%if %{build_xfce} > 0
BuildRequires: Thunar-devel
@@ -331,8 +329,6 @@
cd ../plug-ins
# Patch
-%patch0 -p1 -b .upower0
-%patch1 -p1 -b .upower1
## permission
for dir in */
@@ -644,6 +640,9 @@
%{_libdir}/pkgconfig/*.pc
%changelog
+* Mon Dec 1 2014 Mamoru TASAKA <mtasaka(a)fedoraproject.org> - 3.4.0-1
+- 3.4.0
+
* Sun Aug 24 2014 Mamoru TASAKA <mtasaka(a)fedoraproject.org> - 3.3.2-3
- F-21: rebuild against new upower
Index: sources
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/devel/sources,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- sources 16 Jun 2014 03:08:58 -0000 1.52
+++ sources 1 Dec 2014 05:19:45 -0000 1.53
@@ -1,2 +1,2 @@
-aae077803322049e2488ca7c2980cd0d cairo-dock-3.3.2.tar.gz
-3c40afe91cba65da68a70e5e78b76c24 cairo-dock-plugins-3.3.2.tar.gz
+d08f06a9a78c952b6564e76d571ad76b cairo-dock-3.4.0.tar.gz
+f1efd9b429fa9b8ab8395f9ce3390895 cairo-dock-plugins-3.4.0.tar.gz