Here's a new diff against the last commit.
Please review / commit.
After much discussion with everyone, I've changed e_utils and e_modules
specs so everything is in one package instead of separate packages for
each module / utility. This will make it easier for people to add new
modules / utils without having to rewrite the specs, and keep the total
package count down.
for the one or two people in the world that actually liked it that
way...well those specs are archived in the mailing list :)
There's also a Makefile.am fix for the monitor module to include the new
wireless image.
thanks!
Ryan
Index: apps/e_modules/e_modules.spec
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e_modules/e_modules.spec,v
retrieving revision 1.1
diff -u -r1.1 e_modules.spec
--- apps/e_modules/e_modules.spec 29 Aug 2005 16:27:43 -0000 1.1
+++ apps/e_modules/e_modules.spec 30 Aug 2005 01:47:29 -0000
@@ -13,52 +13,8 @@
BuildRequires: ecore-devel, evas-devel, esmart-devel
BuildRequires: edje-devel, eet-devel, enlightenment-devel >= 0.16.999
Requires: enlightenment >= 0.16.999
-Requires: e_modules-snow, e_modules-flame, e_modules-monitor, e_modules-weather
-Requires: e_modules-notes
-
%description
-Virtual package requiring all e_modules for the Enlightenment window
-manager. Also includes documentation.
-
-%package snow
-Summary: Snow module for the Enlightenment window manager.
-Group: User Interface/Desktops
-Requires: enlightenment >= 0.16.999
-
-%description snow
-Snow module for the Enlightenment window manager.
-
-%package flame
-Summary: Flame module for the Enlightenment window manager.
-Group: User Interface/Desktops
-Requires: enlightenment >= 0.16.999
-
-%description flame
-Flame module for the Enlightenment window manager.
-
-%package notes
-Summary: notes module for the Enlightenment window manager.
-Group: User Interface/Desktops
-Requires: enlightenment >= 0.16.999
-
-%description notes
-notes module for the Enlightenment window manager.
-
-%package weather
-Summary: Weather module for the Enlightenment window manager.
-Group: User Interface/Desktops
-Requires: enlightenment >= 0.16.999
-
-%description weather
-Weather module for the Enlightenment window manager.
-
-%package monitor
-Summary: Monitor module for the Enlightenment window manager.
-Group: User Interface/Desktops
-Requires: enlightenment >= 0.16.999
-
-%description monitor
-Monitor module for the Enlightenment window manager.
+Various extra modules for the Enlightenment DR17 Window Manager.
%prep
%setup -q
@@ -81,31 +37,7 @@
%files
%defattr(-, root, root)
-%doc AUTHORS COPYING COPYING-PLAIN README
-
-%files flame
-%defattr(-, root, root)
-%{_libdir}/%{name}/flame/*
-%{_libdir}/enlightenment/modules_extra/flame/%{_host_os}-%{_target_cpu}/*
-
-%files monitor
-%defattr(-, root, root)
-%{_libdir}/%{name}/monitor/*
-%{_libdir}/enlightenment/modules_extra/monitor/%{_host_os}-%{_target_cpu}/*
-
-%files notes
-%defattr(-, root, root)
-%{_libdir}/%{name}/notes/*
-%{_libdir}/enlightenment/modules_extra/notes/%{_host_os}-%{_target_cpu}/*
-
-%files snow
-%defattr(-, root, root)
-%{_libdir}/%{name}/snow/*
-%{_libdir}/enlightenment/modules_extra/snow/%{_host_os}-%{_target_cpu}/*
-
-%files weather
-%defattr(-, root, root)
-%{_libdir}/%{name}/weather/*
-%{_libdir}/enlightenment/modules_extra/weather/%{_host_os}-%{_target_cpu}/*
+%{_libdir}/%{name}/*
+%{_libdir}/enlightenment/modules_extra/*
%changelog
Index: apps/e_modules/src/modules/monitor/Makefile.am
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e_modules/src/modules/monitor/Makefile.am,v
retrieving revision 1.2
diff -u -r1.2 Makefile.am
--- apps/e_modules/src/modules/monitor/Makefile.am 29 Aug 2005 16:27:43 -0000 1.2
+++ apps/e_modules/src/modules/monitor/Makefile.am 30 Aug 2005 01:47:29 -0000
@@ -16,6 +16,7 @@
memory.png \
over.png \
over_res.png \
+wireless.png \
VeraMono.ttf
EXTRA_DIST = $(files_DATA)
Index: apps/e_utils/e_utils.spec
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e_utils/e_utils.spec,v
retrieving revision 1.1
diff -u -r1.1 e_utils.spec
--- apps/e_utils/e_utils.spec 29 Aug 2005 16:27:43 -0000 1.1
+++ apps/e_utils/e_utils.spec 30 Aug 2005 01:47:30 -0000
@@ -9,18 +9,14 @@
Packager: %{?_packager:%{_packager}}%{!?_packager:Michael Jennings <[EMAIL PROTECTED]>}
Vendor: %{?_vendorinfo:%{_vendorinfo}}%{!?_vendorinfo:The Enlightenment Project (http://www.enlightenment.org/)}
Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}}
-Prefix: %{_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-root
BuildRequires: ecore-devel, evas-devel, esmart-devel, edje-devel, eet-devel
BuildRequires: ewl-devel, imlib2-devel, embryo-devel
BuildRequires: enlightenment-devel >= 0.16.999
Requires: enlightenment >= 0.16.999
-Requires: e_utils-e17setroot, e_utils-e_util_eapp_edit, e_utils-emblem
-Requires: e_utils-entangle, e_utils-exige
%description
-Virtual package to install all utilities for the Enlightenment window
-manager. Also includes documentation.
+Utilities for the Enlightenment window manager.
%package devel
Summary: Development headers for Enlightenment utilities.
@@ -30,55 +26,11 @@
%description devel
Development headers for Enlightenment utilities.
-%package e17setroot
-Summary: Background setting utility for Enlightenment.
-Group: User Interface/Desktops
-Requires: enlightenment >= 0.16.999
-
-%description e17setroot
-Background setting utility for Enlightenment.
-
-%package e_util_eapp_edit
-Summary: eapp editing utility for Enlightenment.
-Group: User Interface/Desktops
-Requires: enlightenment >= 0.16.999
-Requires: e_utils-docs
-
-%description e_util_eapp_edit
-eapp editing utility for Enlightenment.
-
-%package emblem
-Summary: Graphical background selection utility for Enlightenment.
-Group: User Interface/Desktops
-Requires: enlightenment >= 0.16.999
-Requires: e_utils-docs
-
-%description emblem
-Graphical background selection utility for Enlightenment.
-
-%package entangle
-Summary: Graphical menu editing utility for Enlightenment.
-Group: User Interface/Desktops
-Requires: enlightenment >= 0.16.999
-Requires: e_utils-docs
-
-%description entangle
-Graphical menu editing utility for Enlightenment.
-
-%package exige
-Summary: A run dialog box for Enlightenment.
-Group: User Interface/Desktops
-Requires: enlightenment >= 0.16.999
-Requires: e_utils-docs
-
-%description exige
-A run dialog box for Enlightenment.
-
%prep
%setup -q
%build
-%{configure} --prefix=%{_prefix}
+%{configure}
%{__make} %{?_smp_mflags} %{?mflags}
%install
@@ -93,38 +45,14 @@
%postun
/sbin/ldconfig
-%files
-%defattr(-, root, root)
-%doc AUTHORS COPYING COPYING-PLAIN README
-
%files devel
%defattr(-, root, root)
%{_includedir}/*
-%files e17setroot
-%defattr(-, root, root)
-%{_bindir}/e17setroot
-
-%files e_util_eapp_edit
-%defattr(-, root, root)
-%{_bindir}/e_util_eapp_edit
-%{_datadir}/%{name}/data/e_utils_eapp_edit/*
-
-%files emblem
-%defattr(-, root, root)
-%{_bindir}/emblem
-%{_datadir}/%{name}/data/emblem/*
-%{_datadir}/enlightenment/config-apps/emblem.eap
-
-%files entangle
-%defattr(-, root, root)
-%{_bindir}/entangle
-%{_datadir}/%{name}/data/entangle/*
-%{_datadir}/enlightenment/config-apps/entangle.eap
-
-%files exige
+%files
%defattr(-, root, root)
-%{_bindir}/exige
-%{_datadir}/%{name}/data/exige/*
+%{_bindir}/*
+%{_datadir}/%{name}/data/*
+%{_datadir}/enlightenment/config-apps/*
%changelog
