|
|
@@ -1,7 +1,7 @@
|
|
|
Summary: The Enlightenment window manager, DR16.
|
|
|
Summary(ja): Enlightenment ウィンドウマネージャ(DR16)
|
|
|
Name: e16
|
|
|
-Version: 1.0.8
|
|
|
+Version: 1.0.10
|
|
|
Release: 1%{?_dist_release}
|
|
|
License: BSD
|
|
|
Group: User Interface/Desktops
|
|
|
@@ -11,12 +11,15 @@ Source: http://prdownloads.sourceforge.net/enlightenment/%{name}-%{version}.tar.
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
|
|
|
|
BuildRequires: imlib2-devel freetype2-devel xorg-x11-xbitmaps
|
|
|
-BuildRequires: esound-devel alsa-lib-devel audiofile-devel
|
|
|
+BuildRequires: alsa-lib-devel audiofile-devel
|
|
|
BuildRequires: libXrandr-devel libSM-devel xorg-x11-proto-devel
|
|
|
BuildRequires: libXfixes-devel libXrender-devel libXdamage-devel
|
|
|
BuildRequires: libXcomposite-devel libXft-devel libXxf86vm-devel
|
|
|
BuildRequires: libXinerama-devel
|
|
|
-BuildRequires: pango-devel dbus-devel desktop-file-utils
|
|
|
+BuildRequires: pango-devel dbus-devel
|
|
|
+BuildRequires: pulseaudio-libs-devel
|
|
|
+BuildRequires: desktop-file-utils
|
|
|
+#BuildRequires: esound-devel
|
|
|
|
|
|
Obsoletes: enlightenment < 0.16.8
|
|
|
Requires: imlib2 >= 1.2.0
|
|
|
@@ -51,7 +54,9 @@ GNOME/KDE のウィンドウマネージャに Enlightment を選択した後、
|
|
|
%configure --enable-pango \
|
|
|
--enable-mans \
|
|
|
--enable-modules \
|
|
|
- --enable-visibility-hiding
|
|
|
+ --enable-visibility-hiding \
|
|
|
+ --enable-sound-pulse \
|
|
|
+ --enable-sound-esound=no
|
|
|
%{__make} %{?_smp_mflags}
|
|
|
|
|
|
%install
|
|
|
@@ -64,10 +69,19 @@ cp $RPM_BUILD_ROOT/usr/share/e16/misc/Xclients.* $RPM_BUILD_ROOT/etc/X11/xinit/X
|
|
|
|
|
|
%find_lang %{name}
|
|
|
|
|
|
+%if %{?_dist_release} == "vl6"
|
|
|
+# remove gnome3 desktop file
|
|
|
+%{__rm} -f %{buildroot}%{_datadir}/xsessions/e16-gnome3-session.desktop
|
|
|
+%else
|
|
|
+# remove gnome2 desktop file
|
|
|
+%{__rm} -f %{buildroot}%{_datadir}/xsessions/e16-gnome2-session.desktop
|
|
|
+%endif
|
|
|
+
|
|
|
# Desktop file
|
|
|
-%{__rm} -f %{buildroot}%{_datadir}/applications/%{name}.desktop
|
|
|
-%{__cp} %{buildroot}%{_datadir}/e16/misc/e16.desktop-app \
|
|
|
- %{buildroot}%{_datadir}/applications/%{name}.desktop
|
|
|
+#%{__rm} -f %{buildroot}%{_datadir}/applications/%{name}.desktop
|
|
|
+
|
|
|
+#%{__cp} %{buildroot}%{_datadir}/e16/misc/e16.desktop-app \
|
|
|
+# %{buildroot}%{_datadir}/applications/%{name}.desktop
|
|
|
desktop-file-install --dir %{buildroot}%{_datadir}/applications \
|
|
|
%{buildroot}%{_datadir}/applications/%{name}.desktop
|
|
|
|
|
|
@@ -75,7 +89,12 @@ desktop-file-install --dir %{buildroot}%{_datadir}/applications \
|
|
|
rm -rf $RPM_BUILD_ROOT
|
|
|
|
|
|
%post
|
|
|
-if [ "$LANG" = "ja_JP.utf8" ]; then
|
|
|
+if [ "$LANG" = "ja_JP.UTF-8" ]; then
|
|
|
+ echo "GNOME/KDE のウィンドウマネージャに Enlightment を選択した後、"
|
|
|
+ echo "標準のウィンドウマネージャに戻したい場合は、"
|
|
|
+ echo "次のファイルを修正してください。"
|
|
|
+ echo "~/.gconf/desktop/gnome/sessionrequired-components/%gconf.xml"
|
|
|
+elif [ "$LANG" = "ja_JP.utf8" ]; then
|
|
|
echo "GNOME/KDE のウィンドウマネージャに Enlightment を選択した後、"
|
|
|
echo "標準のウィンドウマネージャに戻したい場合は、"
|
|
|
echo "次のファイルを修正してください。"
|
|
|
@@ -95,11 +114,20 @@ fi
|
|
|
%{_datadir}/%{name}/*
|
|
|
%{_datadir}/locale/*
|
|
|
%{_datadir}/applications/*
|
|
|
+%{_datadir}/gnome-session/*
|
|
|
%{_datadir}/xsessions/*
|
|
|
%{_sysconfdir}/X11/xinit/Xclients.d/*
|
|
|
%{_mandir}/*
|
|
|
|
|
|
%changelog
|
|
|
+* Sat Jan 14 2012 Toshiharu Kudoh <toshi.kd2@gmail.com> 1.0.10-1
|
|
|
+- new upstream release
|
|
|
+- dropt BuildRequires: esound-devel
|
|
|
+- added BuildRequires: pulseaudio-libs-devel
|
|
|
+- added configure option --enable-sound-pulse and --enable-sound-esound=no
|
|
|
+- set contitional branch for GNOME session
|
|
|
+ - deleted GNOME3 session (for Vine 6), GNOME2 session (for VineSeed)
|
|
|
+
|
|
|
* Wed May 4 2011 Toshiharu Kudoh <toshi.kd2@gmail.com> 1.0.8-1
|
|
|
- new upstream release
|
|
|
|
kudoh