dist-git conversion

#2781)

.cvsignore

@@ -1,4 +0,0 @@
-emacs-22.1.50.tar.gz
-php-mode-1.2.0.tgz
-emacs-23.0.60.tar.gz
-emacs-22.2.tar.gz

.gitignore

@@ -0,0 +1 @@
+emacs-22.3.tar.gz

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: emacs
-# $Id: Makefile,v 1.1 2004/09/09 04:30:11 cvsdist Exp $
-NAME := emacs
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attempt a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

emacs.spec

@@ -3,8 +3,8 @@
 Summary: GNU Emacs text editor
 Name: emacs
 Epoch: 1
-Version: 22.2
-Release: 4%{?dist}
+Version: 22.3
+Release: 5%{?dist}
 License: GPLv3+
 URL: http://www.gnu.org/software/emacs/
 Group: Applications/Editors
@@ -27,8 +27,8 @@ Source21: igrep-init.el
 Patch0: glibc-open-macro.patch
 Patch1: rpm-spec-mode.patch
 Patch2: po-mode-auto-replace-date-71264.patch
-Patch3: emacs-22.1.50-sparc64.patch
-Patch4: emacs-22.1.50-regex.patch
+#Patch3: emacs-22.1.50-sparc64.patch
+#Patch4: emacs-22.1.50-regex.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: atk-devel, cairo-devel, freetype-devel, fontconfig-devel, giflib-devel, glibc-devel, gtk2-devel, libpng-devel
 BuildRequires: libjpeg-devel, libtiff-devel, libX11-devel, libXau-devel, libXdmcp-devel, libXrender-devel, libXt-devel
@@ -37,7 +37,8 @@ BuildRequires: autoconf, automake, bzip2, cairo, texinfo
 %ifarch %{ix86}
 BuildRequires: setarch
 %endif
-Requires: xorg-x11-fonts-ISO8859-1-100dpi
+Requires: xorg-x11-fonts-ISO8859-1-75dpi
+Requires: xorg-x11-fonts-misc
 Requires: emacs-common = %{epoch}:%{version}-%{release}
 Conflicts: gettext < 0.10.40
 Provides: emacs(bin)
@@ -50,6 +51,8 @@ Provides: emacs(bin)
 %define expurgate 0
 
 %define site_lisp %{_datadir}/emacs/site-lisp
+%define site_start_d %{site_lisp}/site-start.d
+%define bytecompargs -batch --no-init-file --no-site-file -f batch-byte-compile
 %define pkgconfig %{_datadir}/pkgconfig
 
 %description
@@ -105,8 +108,8 @@ Emacs packages or see some elisp examples.
 %prep
 %setup -q
 %patch0 -p1 -b .glibc-open-macro
-%patch3 -p1 -b .sparc64-libdir
-%patch4 -p1 -b .regexp
+#%%patch3 -p1 -b .sparc64-libdir
+#%%patch4 -p1 -b .regexp
 
 # install rest of site-lisp files
 ( cd site-lisp
@@ -149,7 +152,8 @@ TOPDIR=${PWD}
 %define emacsbatch ${TOPDIR}/src/emacs -batch --no-init-file --no-site-file
 
 # make sure patched lisp files get byte-compiled
-%emacsbatch -f batch-byte-compile site-lisp/*.el
+TOPDIR=${PWD}
+${TOPDIR}/src/emacs %{bytecompargs} site-lisp/*.el
 
 %__make %{?_smp_mflags} -C lisp updates
 
@@ -163,6 +167,15 @@ Description: GNU Emacs text editor
 Version: %{epoch}:%{version}
 EOF
 
+# Create macros.emacs RPM macro file
+cat > macros.emacs << EOF
+%%_emacs_version %{version}
+%%_emacs_epoch %{epoch}
+%%_emacs_sitelispdir %{site_lisp}
+%%_emacs_sitestartdir %{site_start_d}
+%%_emacs_bytecompile /usr/bin/emacs %bytecompargs 
+EOF
+
 %install
 rm -rf %{buildroot}
 
@@ -206,6 +219,10 @@ install -m 0644 %SOURCE3 %{buildroot}%{_sysconfdir}/skel/.emacs
 mkdir -p %{buildroot}/%{pkgconfig}
 install -m 0644 emacs.pc %{buildroot}/%{pkgconfig}
 
+# install rpm macro definition file
+mkdir -p %{buildroot}%{_sysconfdir}/rpm
+install -m 0644 macros.emacs %{buildroot}%{_sysconfdir}/rpm/
+
 # after everything is installed, remove info dir
 rm -f %{buildroot}%{_infodir}/dir
 rm %{buildroot}%{_localstatedir}/games/emacs/*
@@ -263,7 +280,7 @@ for f in %{info_files}; do
 done
 
 %preun common
-alternatives --remove etags %{_bindir}/etags.emacs || :
+alternatives --remove emacs.etags %{_bindir}/etags.emacs || :
 if [ "$1" = 0 ]; then
   for f in %{info_files}; do
     /sbin/install-info --delete %{_infodir}/$f.gz %{_infodir}/dir 2> /dev/null || :
@@ -293,6 +310,7 @@ alternatives --install %{_bindir}/etags emacs.etags %{_bindir}/etags.emacs 80 \
 %files -f common-filelist common
 %defattr(-,root,root)
 %config(noreplace) %{_sysconfdir}/skel/.emacs
+%config(noreplace) %{_sysconfdir}/rpm/macros.emacs
 %doc etc/NEWS BUGS README
 %exclude %{_bindir}/emacs-*
 %{_bindir}/*
@@ -313,6 +331,22 @@ alternatives --install %{_bindir}/etags emacs.etags %{_bindir}/etags.emacs 80 \
 %dir %{_datadir}/emacs/%{version}
 
 %changelog
+* Wed Jun 24 2009 Daniel Novotny <dnovotny@redhat.com> 1:22.3-5
+- added xorg-x11-fonts-misc to dependencies (#469220)
+
+* Mon Feb 09 2009 Daniel Novotny <dnovotny@redhat.com> 1:22.3-4
+- fix bz#484309 (alternatives error message)
+
+* Thu Jan 22 2009 Daniel Novotny <dnovotny@redhat.com> 1:22.3-3
+- font dependency changed from 100dpi to 75dpi (the font was too large)
+
+* Sun Jan 18 2009 Jonathan G. Underwood <jonathan.underwood@gmail.com> - 1:22.3-2
+- Add /etc/rpm/macros.emacs file
+
+* Wed Dec 17 2008 Daniel Novotny <dnovotny@redhat.com> 22.3-1
+- update from 22.2 to 22.3 (bz#461448)
+- removed upstreamed patches
+
 * Thu May 01 2008 Tom "spot" Callaway <tcallawa@redhat.com>
 - fix requires to include epoch
 

sources

@@ -1 +1 @@
-d6ee586b8752351334ebf072904c4d51  emacs-22.2.tar.gz
+aa8ba34f548cd78b35914ae5a7bb87eb  emacs-22.3.tar.gz