rpms/cairo-dock/devel .cvsignore, 1.47, 1.48 cairo-dock.spec, 1.68, 1.69 sources, 1.49, 1.50
Mamoru Tasaka
mtasaka at rpmfusion.org
Fri Apr 12 14:56:42 CEST 2013
Author: mtasaka
Update of /cvs/free/rpms/cairo-dock/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv13667
Modified Files:
.cvsignore cairo-dock.spec sources
Log Message:
* Fri Apr 12 2013 Mamoru TASAKA <mtasaka at fedoraproject.org> - 3.2.0-1
- Update to 3.2.0
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/devel/.cvsignore,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- .cvsignore 23 Dec 2011 17:46:25 -0000 1.47
+++ .cvsignore 12 Apr 2013 12:56:41 -0000 1.48
@@ -1,3 +1,2 @@
-cairo-dock-2.4.0~2.tar.gz
-cairo-dock-plugins-2.4.0~2.tar.gz
-cairo-dock-plugins-2.4.0~2.1.tar.gz
+cairo-dock-3.2.0.tar.gz
+cairo-dock-plugins-3.2.0.tar.gz
Index: cairo-dock.spec
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/devel/cairo-dock.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- cairo-dock.spec 3 Mar 2013 21:35:39 -0000 1.68
+++ cairo-dock.spec 12 Apr 2013 12:56:41 -0000 1.69
@@ -16,11 +16,11 @@
# Set the below to 1 when building unstable plug-ins
%global build_other 1
-%global urlver 2.4
-%global mainver 2.4.0
+%global urlver 3.2
+%global mainver 3.2.0
#%%define betaver 0rc1
-%global postver_c 2
-%global postver_p 2.1
+#%%global postver_c 2
+#%%global postver_p 2.1
%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}
@@ -40,10 +40,10 @@
# Bindings
%global build_python 1
-%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
+%global build_python3 1
%global build_ruby 0
-%global rubyabi 1.8
+%global rubyabi 1.9.1
%global ruby_sitearch %(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")
# FIXME
# I don't know well about vala !!
@@ -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
@@ -75,41 +75,32 @@
# For main package
BuildRequires: dbus-glib-devel
-BuildRequires: glitz-glx-devel
-BuildRequires: gtk2-devel
-BuildRequires: gtkglext-devel
+BuildRequires: gtk3-devel
BuildRequires: libcurl-devel
BuildRequires: librsvg2-devel
BuildRequires: libXcomposite-devel
BuildRequires: libXinerama-devel
+BuildRequires: libXrandr-devel
BuildRequires: libXrender-devel
BuildRequires: libxml2-devel
BuildRequires: libXtst-devel
+BuildRequires: libGLU-devel
BuildRequires: perl(XML::Parser)
# 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
BuildRequires: libical-devel
BuildRequires: libxklavier-devel
-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
-# newer libetpan
-BuildRequires: libetpan-devel >= 1.1
+BuildRequires: vte3-devel
+BuildRequires: libetpan-devel
BuildRequires: lm_sensors-devel
# For plug-ins-xfce
%if %{build_xfce} > 0
@@ -118,16 +109,23 @@
%if %{build_webkit} > 0
# For plug-ins-webkit
# Now using webkit, not gecko
-BuildRequires: WebKit-gtk-devel
+BuildRequires: webkitgtk3-devel
%endif
# Bindings
%if %{build_python}
BuildRequires: python2-devel
%endif
+%if %{build_python3}
+BuildRequires: python3-devel
+%endif
%if %{build_ruby}
+%if 0%{?fedora} >= 19
+BuildRequires: ruby(release)
+%else
BuildRequires: ruby(abi) = %{rubyabi}
BuildRequires: ruby
+%endif
BuildRequires: ruby-devel
%endif
%if %{build_vala}
@@ -147,7 +145,7 @@
%package core
Summary: Core files for %{name}
Version: %{rpmver_c}
-Release: %{rpmrel}.1
+Release: %{rpmrel}
Group: User Interface/Desktops
# Requires related to commands used internally
# in cairo-dock
@@ -177,7 +175,7 @@
%package plug-ins
Summary: Plug-ins files for %{name}
Version: %{rpmver_p}
-Release: %{rpmrel}.1
+Release: %{rpmrel}
Group: User Interface/Desktops
Requires: %{name}-core = %{rpmver_c}-%{rpmrel}
@@ -187,7 +185,7 @@
%package plug-ins-xfce
Summary: Plug-ins files for %{name} related to Xfce
Version: %{rpmver_p}
-Release: %{rpmrel}.1
+Release: %{rpmrel}
Group: User Interface/Desktops
Requires: %{name}-core = %{rpmver_c}-%{rpmrel}
@@ -198,7 +196,7 @@
%package plug-ins-kde
Summary: Plug-ins files for %{name} related to KDE
Version: %{rpmver_p}
-Release: %{rpmrel}.1
+Release: %{rpmrel}
Group: User Interface/Desktops
Requires: %{name}-core = %{rpmver_c}-%{rpmrel}
@@ -209,7 +207,7 @@
%package plug-ins-webkit
Summary: Plug-ins files for %{name} related to Gecko
Version: %{rpmver_p}
-Release: %{rpmrel}.1
+Release: %{rpmrel}
Group: User Interface/Desktops
Requires: %{name}-core = %{rpmver_c}-%{rpmrel}
@@ -220,7 +218,7 @@
%package python
Summary: Python binding for %{name}
Version: %{rpmver_p}
-Release: %{rpmrel}.1
+Release: %{rpmrel}
Group: User Interface/Desktops
Requires: %{name}-core = %{rpmver_c}-%{rpmrel}
Requires: pygobject2
@@ -229,13 +227,29 @@
%description python
This package contains Python binding files for %{name}
+%package python3
+Summary: Python3 binding for %{name}
+Version: %{rpmver_p}
+Release: %{rpmrel}
+Group: User Interface/Desktops
+Requires: %{name}-core = %{rpmver_c}-%{rpmrel}
+Requires: pygobject3
+Requires: python3-dbus
+
+%description python3
+This package contains Python3 binding files for %{name}
+
%package ruby
Summary: Ruby binding for %{name}
Version: %{rpmver_p}
-Release: %{rpmrel}.1
+Release: %{rpmrel}
Group: User Interface/Desktops
Requires: %{name}-core = %{rpmver_c}-%{rpmrel}
+%if 0%{?fedora} >= 19
+Requires: ruby(release)
+%else
Requires: ruby(abi) = %{rubyabi}
+%endif
Requires: rubygems
# The following is not in Fedora yet
Requires: rubygem(dbus)
@@ -246,7 +260,7 @@
%package vala
Summary: Vala binding for %{name}
Version: %{rpmver_p}
-Release: %{rpmrel}.1
+Release: %{rpmrel}
Group: User Interface/Desktops
Requires: %{name}-core = %{rpmver_c}-%{rpmrel}
# ???
@@ -258,7 +272,7 @@
%package devel
Summary: Development files for %{name}
Version: %{rpmver_c}
-Release: %{rpmrel}.1
+Release: %{rpmrel}
Group: Development/Libraries
Requires: %{name}-core = %{rpmver_c}-%{rpmrel}
@@ -291,6 +305,7 @@
find $dir -type f | xargs chmod 0644
done
chmod 0644 [A-Z]*
+chmod 0755 */
## cmake issue
sed -i.debuglevel \
@@ -331,7 +346,7 @@
## Bindings
# Ruby
sed -i.site \
- -e "s|CONFIG\['rubylibdir'\]|CONFIG['sitearchdir']|" \
+ -e "s|CONFIG\['rubylibdir'\]|CONFIG['vendorlibdir']|" \
CMakeLists.txt
# Python
## FIXME
@@ -466,7 +481,7 @@
LGPL-2 \
LICENSE \
copyright \
- data/ChangeLog.txt \
+ data/ChangeLog*.txt \
$TOPDIR/documents/main/
popd # from cairo-dock
@@ -532,7 +547,7 @@
%doc documents/main/*
%{_bindir}/*%{name}*
-%{_libdir}/libgldi.so.2*
+%{_libdir}/libgldi.so.3*
%{_datadir}/applications/%{name}*.desktop
%{_datadir}/pixmaps/%{name}.svg
@@ -549,9 +564,10 @@
%{_datadir}/%{name}/scripts/
%dir %{_datadir}/%{name}/themes/
%dir %{_datadir}/%{name}/plug-ins/
-%{_datadir}/%{name}/themes/_default_/
-# only directory
+%{_datadir}/%{name}/themes/Default-Panel/
+%{_datadir}/%{name}/themes/Default-Single/
%dir %{_libdir}/%{name}/
+%{_libdir}/%{name}/libcd-Help.so
%{_mandir}/man1/%{name}.1*
@@ -560,6 +576,8 @@
%doc documents/plug-ins/*
%{_libdir}/%{name}/*
+%exclude %{_libdir}/%{name}/libcd-Help.so
+
%{_datadir}/%{name}/plug-ins/*
%if %{build_webkit} > 0
%exclude %{_libdir}/%{name}/*weblet*
@@ -600,6 +618,16 @@
%{python_sitelib}/*.egg-info
%endif
+%if %{build_python3} > 0
+%files python3
+%defattr(-,root,root,-)
+%{python3_sitelib}/CairoDock.py*
+%{python3_sitelib}/CDApplet.py*
+%{python3_sitelib}/CDBashApplet.py*
+%{python3_sitelib}/*.egg-info
+%{python3_sitelib}/__pycache__/
+%endif
+
%if %{build_ruby} > 0
%files ruby
%defattr(-,root,root,-)
@@ -613,6 +641,9 @@
%{_libdir}/pkgconfig/*.pc
%changelog
+* Fri Apr 12 2013 Mamoru TASAKA <mtasaka at fedoraproject.org> - 3.2.0-1
+- Update to 3.2.0
+
* Sun Mar 03 2013 Nicolas Chauvet <kwizart at gmail.com> - 2.4.0.2-2.1
- Mass rebuilt for Fedora 19 Features
Index: sources
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/devel/sources,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- sources 23 Dec 2011 17:46:25 -0000 1.49
+++ sources 12 Apr 2013 12:56:41 -0000 1.50
@@ -1,3 +1,2 @@
-2407e97b74a97c383dd7ef4f0c83a206 cairo-dock-2.4.0~2.tar.gz
-38cba2c63c815e359a5d86cba0d209df cairo-dock-plugins-2.4.0~2.tar.gz
-76b137bf7823622e39f98b3b75d0cc21 cairo-dock-plugins-2.4.0~2.1.tar.gz
+47a8c9d8981c6f31fae1971a0db1b9a4 cairo-dock-3.2.0.tar.gz
+b4e2ce504b4a6ccfdb380482ebe6e77e cairo-dock-plugins-3.2.0.tar.gz
More information about the rpmfusion-commits
mailing list