[xemacs] * Tue Mar 1 2011 Jerry James <loganjerry at gmail.com> - 21.5.29-17 - Add filesystem subpackage (bz 67

Jerry James jjames at fedoraproject.org
Tue Mar 1 18:20:51 UTC 2011 

commit 5c56d55d4cbffce427b7e5b6b143bbdfb472f71d
Author: Jerry James <loganjerry at gmail.com>
Date:   Tue Mar 1 11:20:21 2011 -0700

    * Tue Mar  1 2011 Jerry James <loganjerry at gmail.com> - 21.5.29-17
    - Add filesystem subpackage (bz 672093).
    - Add gnuclient desktop file.
    - Fix CFLAGS so -fno-strict-aliasing actually gets used.
    - Add . to the default load-path in _xemacs_bytecompile.
    - Update Requires for pre/post(un) scripts.

 gnuclient.desktop |   11 ++++++++
 xemacs.desktop    |    1 +
 xemacs.spec       |   74 ++++++++++++++++++++++++++++++++++++++++++++--------
 3 files changed, 74 insertions(+), 12 deletions(-)
---
diff --git a/gnuclient.desktop b/gnuclient.desktop
new file mode 100644
index 0000000..9dfdb5e
--- /dev/null
+++ b/gnuclient.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=XEmacs Client
+GenericName=Text Editor
+Comment=Edit text
+MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
+Exec=gnuclient %f
+Icon=xemacs
+Type=Application
+Terminal=false
+Categories=Application;Utility;TextEditor;
+StartupWMClass=XEmacs
diff --git a/xemacs.desktop b/xemacs.desktop
index 9296058..2ab2a7a 100644
--- a/xemacs.desktop
+++ b/xemacs.desktop
@@ -24,6 +24,7 @@ Name[sl]=Urejevalnik XEmacs
 Name[uk]=Редактор XEmacs
 GenericName=Text Editor
 Comment=Edit text
+Comment[zh_TW]=編輯文字
 MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
 Exec=xemacs %f
 Icon=xemacs
diff --git a/xemacs.spec b/xemacs.spec
index c6b7952..b080abb 100644
--- a/xemacs.spec
+++ b/xemacs.spec
@@ -21,7 +21,7 @@
 
 Name:           xemacs
 Version:        21.5.29
-Release:        16%{?snap:.%{snap}}%{?dist}
+Release:        17%{?snap:.%{snap}}%{?dist}
 Summary:        Different version of Emacs
 
 Group:          Applications/Editors
@@ -37,6 +37,7 @@ Source2:        xemacs.desktop
 Source3:        dotxemacs-init.el
 Source4:        default.el
 Source5:        xemacs-sitestart.el
+Source6:        gnuclient.desktop
 
 Patch0:         %{name}-21.5.26-utf8-fonts.patch
 Patch1:         %{name}-21.5.25-x-paths.patch
@@ -105,7 +106,14 @@ Requires:       %{name}-common = %{version}-%{release}
 Requires:       xorg-x11-fonts-ISO8859-1-75dpi
 Requires:       xorg-x11-fonts-ISO8859-1-100dpi
 Requires:       xorg-x11-fonts-misc
+Requires(post): chkconfig
 Requires(post): coreutils
+Requires(post): desktop-file-utils
+Requires(post): gtk2
+Requires(postun): chkconfig
+Requires(postun): coreutils
+Requires(postun): desktop-file-utils
+Requires(postun): gtk2
 Provides:       xemacs(bin) = %{version}-%{release}
 
 %global xver    %(echo %{version} | sed -e 's/\\.\\([0-9]\\+\\)$/-b\\1/')
@@ -123,9 +131,9 @@ This package contains XEmacs built for X Windows%{?with_mule: with MULE support}
 %package        common
 Summary:        Byte-compiled lisp files and other common files for XEmacs
 Group:          Applications/Editors
-Requires:       xemacs(bin) = %{version}-%{release}
-Requires(post): %{_sbindir}/alternatives
-Requires(preun): %{_sbindir}/alternatives
+Requires:       %{name}-filesystem = %{version}-%{release}
+Requires(post): chkconfig
+Requires(preun): chkconfig
 
 %description    common
 XEmacs is a highly customizable open source text editor and
@@ -142,7 +150,9 @@ Group:          Applications/Editors
 # Note: no xemacs-packages* dependencies here, we need -nox to build the
 # base package set.
 Requires:       %{name}-common = %{version}-%{release}
+Requires(post): chkconfig
 Requires(post): coreutils
+Requires(postun): chkconfig
 Provides:       xemacs(bin) = %{version}-%{release}
 
 %description    nox
@@ -159,7 +169,9 @@ Summary:        Different version of Emacs built with Xft/fontconfig support
 Group:          Applications/Editors
 Requires:       %{name}-common = %{version}-%{release}
 Requires:       xemacs-packages-base >= 20060510
+Requires(post): chkconfig
 Requires(post): coreutils
+Requires(postun): chkconfig
 Provides:       xemacs(bin) = %{version}-%{release}
 
 %description    xft
@@ -174,7 +186,7 @@ This package contains XEmacs built with Xft and fontconfig support.
 %package        el
 Summary:        Emacs lisp source files for XEmacs
 Group:          Development/Libraries
-Requires:       %{name}-common = %{version}-%{release}
+Requires:       %{name}-filesystem = %{version}-%{release}
 
 %description    el
 XEmacs is a highly customizable open source text editor and
@@ -192,8 +204,8 @@ Group:          Documentation
 %if 0%{?fedora} >= 10
 BuildArch:      noarch
 %endif
-Requires(post): /sbin/install-info
-Requires(preun): /sbin/install-info
+Requires(post): info
+Requires(preun): info
 
 %description    info
 XEmacs is a highly customizable open source text editor and
@@ -219,6 +231,19 @@ and an open software development model, similar to Linux.
 
 This package contains XEmacs development support files.
 
+%package        filesystem
+Summary:        XEmacs filesystem layout
+Group:          Applications/Editors
+
+%description    filesystem
+XEmacs is a highly customizable open source text editor and
+application development system.  It is protected under the GNU General
+Public License and related to other versions of Emacs, in particular
+GNU Emacs.  Its emphasis is on modern graphical user interface support
+and an open software development model, similar to Linux.
+
+This package contains directories that are required by other packages that
+add functionality to XEmacs.
 
 %prep
 %setup -q -n %{name}-%{?snap:beta}%{!?snap:%{version}}
@@ -256,9 +281,10 @@ done
 
 
 %build
-CFLAGS="${CFLAGS:-$RPM_OPT_FLAGS -fno-strict-aliasing}"
 %if %{with gtk}
-CFLAGS="$CFLAGS $(pkg-config libglade --cflags)"
+CFLAGS="$CFLAGS $(pkg-config libglade --cflags) -fno-strict-aliasing"
+%else
+CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
 %endif
 export CFLAGS
 export EMACSLOADPATH=$PWD/lisp:$PWD/lisp/mule
@@ -394,7 +420,7 @@ cat > macros.xemacs << EOF
 %%_xemacs_sitepkgdir %{_datadir}/xemacs/site-packages
 %%_xemacs_sitelispdir %{_datadir}/xemacs/site-packages/lisp
 %%_xemacs_sitestartdir %{_datadir}/xemacs/site-packages/lisp/site-start.d
-%%_xemacs_bytecompile /usr/bin/xemacs -q -no-site-file -batch -f batch-byte-compile
+%%_xemacs_bytecompile /usr/bin/xemacs -q -no-site-file -batch -eval '(push "." load-path)' -f batch-byte-compile
 %if %{with modules}
 %%_xemacs_includedir %{_libdir}/xemacs-%{xver}/%{xbuild}/include
 %%_xemacs_sitemoduledir %{_libdir}/xemacs/site-modules
@@ -449,6 +475,10 @@ desktop-file-install --vendor=fedora --mode=644 \
     --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
     %{SOURCE2}
 
+desktop-file-install --vendor=fedora --mode=644 \
+    --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
+    %{SOURCE6}
+
 # site-start.el
 install -dm 755 \
     $RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/lisp/site-start.d
@@ -493,10 +523,10 @@ echo "%%defattr(-,root,root,-)" > base-files
 echo "%%defattr(-,root,root,-)" > el-files
 echo "%%defattr(-,root,root,-)" > info-files
 
-find $RPM_BUILD_ROOT{%{_datadir}/xemacs-%{xver},%{_datadir}/xemacs} \
+find $RPM_BUILD_ROOT%{_datadir}/xemacs{-%{xver},/site-packages/lisp/*} \
   \( -type f -not -name '*.el' -fprint base-non-el.files \) -o \
   \( -type d -name info -fprint info.files -prune \) -o \
-  \( -type d -fprintf dir.files "%%%%dir %%p\n" \) -o \
+  \( -type d -not -name site-start.d -fprintf dir.files "%%%%dir %%p\n" \) -o \
   \( -name '*.el' \( -exec test -e '{}'c \; -fprint el-bytecomped.files -o \
      -fprint base-el-not-bytecomped.files \) \)
 sed -i -e "s|$RPM_BUILD_ROOT||" *.files
@@ -597,6 +627,7 @@ fi
 %endif
 %endif
 %{_datadir}/applications/*-%{name}.desktop
+%{_datadir}/applications/gnuclient.desktop
 %{_datadir}/icons/hicolor/48x48/apps/xemacs.png
 %{_mandir}/man1/gnuclient.1*
 %{_mandir}/man1/gnudoit.1*
@@ -663,8 +694,27 @@ fi
 %endif
 %{_libdir}/pkgconfig/xemacs.pc
 
+%files filesystem
+%defattr(-,root,root,-)
+%dir %{_datadir}/xemacs
+%dir %{_datadir}/xemacs/site-lisp
+%dir %{_datadir}/xemacs/site-packages
+%dir %{_datadir}/xemacs/site-packages/etc
+%dir %{_datadir}/xemacs/site-packages/info
+%dir %{_datadir}/xemacs/site-packages/lib-src
+%dir %{_datadir}/xemacs/site-packages/lisp
+%dir %{_datadir}/xemacs/site-packages/lisp/site-start.d
+%dir %{_datadir}/xemacs/site-packages/man
+%dir %{_datadir}/xemacs/site-packages/pkginfo
 
 %changelog
+* Tue Mar  1 2011 Jerry James <loganjerry at gmail.com> - 21.5.29-17
+- Add filesystem subpackage (bz 672093).
+- Add gnuclient desktop file.
+- Fix CFLAGS so -fno-strict-aliasing actually gets used.
+- Add . to the default load-path in _xemacs_bytecompile.
+- Update Requires for pre/post(un) scripts.
+
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 21.5.29-16
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild

More information about the scm-commits mailing list