rpms/cairo-dock/F-11 .cvsignore, 1.28, 1.29 cairo-dock.spec, 1.36, 1.37 sources, 1.30, 1.31

[Mamoru Tasaka]

Author: mtasaka

Update of /cvs/free/rpms/cairo-dock/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv31874/F-11

Modified Files:
	.cvsignore cairo-dock.spec sources 
Log Message:
* Sun Mar 14 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.1.3.7-1
- 2.1.3-7
- Some packaging changes out of requests from the upstream
  * rename %name package to -core, make %name be a metapkg for
    pulling -core and -plug-ins
  * split kde related files from -plug-ins
- Change R: wget -> curl



Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/F-11/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	2 Mar 2010 16:35:51 -0000	1.28
+++ .cvsignore	13 Mar 2010 17:06:41 -0000	1.29
@@ -1,2 +1,2 @@
-cairo-dock-2.1.3-6.tar.gz
-cairo-dock-plugins-2.1.3-6.tar.gz
+cairo-dock-2.1.3-7.tar.gz
+cairo-dock-plugins-2.1.3-7.tar.gz


Index: cairo-dock.spec
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/F-11/cairo-dock.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- cairo-dock.spec	2 Mar 2010 16:35:51 -0000	1.36
+++ cairo-dock.spec	13 Mar 2010 17:06:41 -0000	1.37
@@ -19,7 +19,7 @@
 %global		urlver		2.1
 %global		mainver	2.1.3
 %undefine		betaver
-%global		postver	6
+%global		postver	7
 
 %global		build_webkit	1
 %global		build_xfce	1
@@ -98,10 +98,23 @@
 # Now using webkit, not gecko
 BuildRequires:	WebKit-gtk-devel
 %endif
+
+# This is a meta package to install cairo-dock-core and
+# cairo-dock-plug-ins
+Requires:	%{name}-core = %{version}-%{release}
+Requires:	%{name}-plug-ins = %{version}-%{release}
+
+%description
+This is a metapackage for installing all default packages
+related to cairo-dock.
+
+%package	core
+Summary:	Core files for %{name}
+Group:		User Interface/Desktops
 # Requires related to commands used internally
 # in cairo-dock
 Requires:	findutils
-Requires:	wget
+Requires:	curl
 Requires:	xterm
 
 # Obsoletes moved to main package
@@ -116,15 +129,17 @@
 # cairo-dock-themes is obsoleted
 Obsoletes:	%{name}-themes < %{version}-%{release}
 
-%description
+%description	core
 An light eye-candy fully themable animated dock for any 
 Linux desktop. It has a family-likeness with OSX dock,
 but with more options.
 
+This is the core package of cairo-dock.
+
 %package	plug-ins
 Summary:	Plug-ins files for %{name}
 Group:		User Interface/Desktops
-Requires:	%{name} = %{version}-%{release}
+Requires:	%{name}-core = %{version}-%{release}
 
 %description	plug-ins
 This package contains plug-ins files for %{name}.
@@ -132,16 +147,25 @@
 %package	plug-ins-xfce
 Summary:	Plug-ins files for %{name} related to Xfce
 Group:		User Interface/Desktops
-Requires:	%{name} = %{version}-%{release}
+Requires:	%{name}-core = %{version}-%{release}
 
 %description	plug-ins-xfce
 This package contains plug-ins files for %{name} related
 to Xfce.
 
+%package	plug-ins-kde
+Summary:	Plug-ins files for %{name} related to KDE
+Group:		User Interface/Desktops
+Requires:	%{name}-core = %{version}-%{release}
+
+%description	plug-ins-kde
+This package contains plug-ins files for %{name} related
+to KDE.
+
 %package	plug-ins-webkit
 Summary:	Plug-ins files for %{name} related to Gecko
 Group:		User Interface/Desktops
-Requires:	%{name} = %{version}-%{release}
+Requires:	%{name}-core = %{version}-%{release}
 
 %description	plug-ins-webkit
 This package contains plug-ins files for %{name} related
@@ -151,7 +175,7 @@
 Summary:	Development files for %{name}
 Group:		Development/Libraries
 
-Requires:	%{name} = %{version}-%{release}
+Requires:	%{name}-core = %{version}-%{release}
 Requires:	pkgconfig
 Requires:	dbus-glib-devel
 Requires:	gtk2-devel
@@ -520,7 +544,10 @@
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 
-%files -f %{name}.lang
+%files
+%defattr(-,root,root,-)
+
+%files core -f %{name}.lang
 %defattr(-,root,root,-)
 %doc	documents/main/*
 
@@ -557,6 +584,8 @@
 %exclude	%{_libdir}/%{name}/*xfce*
 %exclude	%{_datadir}/%{name}/plug-ins/*xfce*
 %endif
+%exclude	%{_libdir}/%{name}/*kde*
+%exclude	%{_datadir}/%{name}/plug-ins/*kde*
 
 %if %{build_xfce} > 0
 %files	plug-ins-xfce
@@ -565,6 +594,11 @@
 %{_datadir}/%{name}/plug-ins/*xfce*
 %endif
 
+%files	plug-ins-kde
+%defattr(-,root,root,-)
+%{_libdir}/%{name}/*kde*
+%{_datadir}/%{name}/plug-ins/*kde*
+
 %if %{build_webkit} > 0
 %files	plug-ins-webkit -f lang-webkit.lang
 %defattr(-,root,root,-)
@@ -578,6 +612,14 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Sun Mar 14 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.1.3.7-1
+- 2.1.3-7
+- Some packaging changes out of requests from the upstream
+  * rename %%name package to -core, make %%name be a metapkg for
+    pulling -core and -plug-ins
+  * split kde related files from -plug-ins
+- Change R: wget -> curl
+
 * Wed Mar  3 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.1.3.6-1
 - 2.1.3-6
 


Index: sources
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/F-11/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	2 Mar 2010 16:35:51 -0000	1.30
+++ sources	13 Mar 2010 17:06:41 -0000	1.31
@@ -1,2 +1,2 @@
-7d80299776948b78f6382fec634aa459  cairo-dock-2.1.3-6.tar.gz
-9bfb533b8721f6285647e922044afafe  cairo-dock-plugins-2.1.3-6.tar.gz
+2d1c60d74fb5f49a56f6b0b2f45e628d  cairo-dock-2.1.3-7.tar.gz
+e16f4d71a5c751bd580834a55af98ab9  cairo-dock-plugins-2.1.3-7.tar.gz