Author: qboosh                       Date: Tue Jan 22 19:20:03 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- separated gtk,qt4 interfaces one of which is required
- suggest matching compizconfig backend (instead of requiring KDE)
- VERSION is specified as 0.0.0, where did that "5.2" come from?

---- Files affected:
SPECS:
   compiz-fusion-icon.spec (1.11 -> 1.12) 

---- Diffs:

================================================================
Index: SPECS/compiz-fusion-icon.spec
diff -u SPECS/compiz-fusion-icon.spec:1.11 SPECS/compiz-fusion-icon.spec:1.12
--- SPECS/compiz-fusion-icon.spec:1.11  Mon Jan  7 08:47:49 2008
+++ SPECS/compiz-fusion-icon.spec       Tue Jan 22 20:19:58 2008
@@ -1,29 +1,26 @@
 # $Revision$, $Date$
-# TODO: py_postclean (after checking); verify py_*comp with bogus paths
 %define                _rel    071103git
 %define                _name   fusion-icon
 Summary:       Small program to control your GL Desktop
 Summary(pl.UTF-8):     Mały program do kontroli pulpitu GL
 Name:          compiz-%{_name}
-Version:       5.2
+Version:       0.0.0
 Release:       1.%{_rel}.1
 Epoch:         1
 License:       GPL v2+
 Group:         X11/Window Managers/Tools
-#Source0:      
http://releases.beryl-project.org/%{version}/%{name}-%{version}.tar.bz2
 Source0:       %{_name}-%{_rel}.tar.bz2
 # Source0-md5: 7cf51276a0fb33a357f921e3f320b86f
-URL:           http://beryl-project.org/
-BuildRequires: python-devel
+URL:           http://compiz-fusion.org/
+BuildRequires: python-devel >= 1:2.5
 BuildRequires: rpm-pythonprov
 BuildRequires: rpmbuild(macros) >= 1.311
 Requires(post,postun): gtk+2
 Requires(post,postun): hicolor-icon-theme
+Requires:      %{name}-interface = %{version}-%{release}
 Requires:      compiz >= 0.5.1
-Requires:      compizconfig-backend-kconfig
 Requires:      python-compizconfig
 Requires:      xorg-app-xvinfo
-Suggests:      python-PyQt4
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -37,6 +34,36 @@
 pozwala na kontrolę pulpitu GL. Obsługuje różne dekoratory (GL/nie-GL)
 i konfiguratory.
 
+%package interface-gtk
+Summary:       GTK+ interface for Compiz Fusion Icon
+Summary(pl.UTF-8):     Compiz Fusion Icon - interfejs GTK+
+Group:         X11/Window Managers/Tools
+Requires:      %{name} = %{version}-%{release}
+Requires:      python-pygtk-gtk >= 2:2.10.0
+Suggests:      compizconfig-backend-gconf
+Provides:      %{name}-interface = %{version}-%{release}
+
+%description interface-gtk
+GTK+ interface for Compiz Fusion Icon.
+
+%description interface-gtk -l pl.UTF-8
+Compiz Fusion Icon - interfejs GTK+.
+
+%package interface-qt4
+Summary:       Qt4 interface for Compiz Fusion Icon
+Summary(pl.UTF-8):     Compiz Fusion Icon - interfejs Qt4+
+Group:         X11/Window Managers/Tools
+Requires:      %{name} = %{version}-%{release}
+Requires:      python-PyQt4
+Suggests:      compizconfig-backend-kconfig
+Provides:      %{name}-interface = %{version}-%{release}
+
+%description interface-qt4
+Qt4 interface for Compiz Fusion Icon.
+
+%description interface-qt4 -l pl.UTF-8
+Compiz Fusion Icon - interfejs Qt4.
+
 %prep
 %setup -q -n %{_name}
 
@@ -52,32 +79,48 @@
        --skip-build \
        --root $RPM_BUILD_ROOT
 
-# ???
-%py_comp $RPM_BUILD_ROOT%{_datadir}/fusion-icon
-%py_ocomp $RPM_BUILD_ROOT%{_datadir}/fusion-icon
+%py_postclean
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+%update_icon_cache hicolor
+
+%postun
+%update_icon_cache hicolor
+
 %files
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/fusion-icon
 %{_desktopdir}/fusion-icon.desktop
 %dir %{py_sitescriptdir}/FusionIcon
-%dir %{py_sitescriptdir}/FusionIcon/interface_gtk
-%dir %{py_sitescriptdir}/FusionIcon/interface_qt4
-%{py_sitescriptdir}/FusionIcon/*.py*
-%{py_sitescriptdir}/FusionIcon/interface_gtk/*.py*
-%{py_sitescriptdir}/FusionIcon/interface_qt4/*.py*
+%{py_sitescriptdir}/FusionIcon/*.py[co]
+%{py_sitescriptdir}/fusion_icon-*.egg-info
 %{_iconsdir}/hicolor/*x*/apps/fusion-icon.png
 %{_iconsdir}/hicolor/scalable/apps/fusion-icon.svg
 
+%files interface-gtk
+%defattr(644,root,root,755)
+%dir %{py_sitescriptdir}/FusionIcon/interface_gtk
+%{py_sitescriptdir}/FusionIcon/interface_gtk/*.py[co]
+
+%files interface-qt4
+%defattr(644,root,root,755)
+%dir %{py_sitescriptdir}/FusionIcon/interface_qt4
+%{py_sitescriptdir}/FusionIcon/interface_qt4/*.py[co]
+
 %define date   %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <[EMAIL PROTECTED]>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.12  2008-01-22 19:19:58  qboosh
+- separated gtk,qt4 interfaces one of which is required
+- suggest matching compizconfig backend (instead of requiring KDE)
+- VERSION is specified as 0.0.0, where did that "5.2" come from?
+
 Revision 1.11  2008-01-07 07:47:49  qboosh
 - some cleanups
 
================================================================

---- CVS-web:
    
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/compiz-fusion-icon.spec?r1=1.11&r2=1.12&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to