fedora-rpmdevtools/emacs fedora-init.el,1.4,1.5
Ville Skytta (scop)
fedora-extras-commits at redhat.com
Thu Oct 6 16:15:17 UTC 2005
Author: scop
Update of /cvs/fedora/fedora-rpmdevtools/emacs
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11974/emacs
Modified Files:
fedora-init.el
Log Message:
Use fedora-newrpmspec in fedora-init.el.
Index: fedora-init.el
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/emacs/fedora-init.el,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fedora-init.el 8 Feb 2004 19:19:12 -0000 1.4
+++ fedora-init.el 6 Oct 2005 16:15:15 -0000 1.5
@@ -5,37 +5,8 @@
(set (make-local-variable 'indent-tabs-mode) nil)
(set (make-local-variable 'buffer-file-coding-system) 'utf-8)
(if buffer-file-name
- (let* ((pkgname
- (file-relative-name
- (file-name-sans-extension buffer-file-name)))
- (cpandist
- (if (string-match "^perl-\\(.*\\)$" pkgname)
- (match-string 1 pkgname) nil))
- (pythonpkg (string-match "^python-" pkgname)))
- (cond
- (cpandist
- (insert-file-contents
- "/usr/share/fedora/spectemplate-perl.spec"))
- (pythonpkg
- (insert-file-contents
- "/usr/share/fedora/spectemplate-python.spec"))
- (t
- (insert-file-contents
- "/usr/share/fedora/spectemplate-minimal.spec")))
- (goto-char (point-min))
- (and (re-search-forward "^\\(Name:\\s-*\\).*$" nil t)
- (replace-match (concat (match-string 1) pkgname) t))
- (when cpandist
- (goto-char (point-min))
- (and (re-search-forward "^\\(URL:\\s-*\\).*$" nil t)
- (replace-match (concat (match-string 1)
- "http://search.cpan.org/dist/"
- cpandist "/") t))
- (goto-char (point-min))
- (and (re-search-forward "^\\(%setup\\s-+-q\\).*$" nil t)
- (replace-match (concat (match-string 1)
- " -n " cpandist "-%{version}") t))))
- (insert-file-contents "/usr/share/fedora/spectemplate-minimal.spec"))
+ (call-process "fedora-newrpmspec" nil t nil "-o" "-" buffer-file-name)
+ (call-process "fedora-newrpmspec" nil t nil "-o" "-"))
(goto-char (point-min))
(re-search-forward "^[A-Za-z]+:\\s-*$" nil t)
(set-buffer-modified-p nil))
More information about the scm-commits
mailing list