[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[emms-help] Packaging as RPM and Makefile
From: |
Tim Landscheidt |
Subject: |
[emms-help] Packaging as RPM and Makefile |
Date: |
Mon, 31 May 2010 22:15:45 +0000 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/23.1 (gnu/linux) |
Hi,
I really like EMMS and its no-frills attitude, and so I
started to package release 3.0 as an RPM (please find the
spec file attached).
In the course of that, I eliminated a couple of warnings
(attachment #2) and I had to patch the Makefile as the DEST-
DIR variable was unconditionally set and some other errors
occured (attachment #3).
As 3.0 is probably no longer maintained, the first patch
may not be so interesting, but I noticed that HEAD's Make-
file still bears the same characteristics, and before I have
a try at packaging a development snapshot, I'd rather settle
this first.
Any thoughts?
Thanks again for EMMS,
Tim
emms.spec
Description: RPM spec for EMMS.
diff -urx '*~' emms-3.0.orig/emms-browser.el emms-3.0/emms-browser.el
--- emms-3.0.orig/emms-browser.el 2010-05-31 16:20:51.450823100 +0000
+++ emms-3.0/emms-browser.el 2010-05-31 21:30:02.113824817 +0000
@@ -930,8 +930,7 @@
(interactive)
(let* ((data (emms-browser-data-at-point)))
(save-excursion
- (next-line 1)
- (beginning-of-line)
+ (forward-line 1)
(dolist (data-item data)
(emms-browser-insert-data-item data-item)))))
diff -urx '*~' emms-3.0.orig/emms-stream-info.el emms-3.0/emms-stream-info.el
--- emms-3.0.orig/emms-stream-info.el 2010-05-31 16:20:52.447823435 +0000
+++ emms-3.0/emms-stream-info.el 2010-05-31 21:32:51.649825566 +0000
@@ -440,22 +440,22 @@
;; Look for headers
(unless emms-stream-info-header-flag
- (mapcar (lambda (term)
- (goto-char (point-min))
- (if (re-search-forward
- (concat (regexp-opt
- (list "icy-" "ice-"))
- term
- ":\\("
- emms-stream-info-stream-header-regexp
- "\\)")
- (point-max) t)
- (progn
- (add-to-list 'emms-stream-info-found
- (cons term
- (emms-match-string-no-properties 1)))
- (setq emms-stream-info-header-flag t))))
- emms-stream-info-vocab))
+ (mapc (lambda (term)
+ (goto-char (point-min))
+ (if (re-search-forward
+ (concat (regexp-opt
+ (list "icy-" "ice-"))
+ term
+ ":\\("
+ emms-stream-info-stream-header-regexp
+ "\\)")
+ (point-max) t)
+ (progn
+ (add-to-list 'emms-stream-info-found
+ (cons term
+ (emms-match-string-no-properties 1)))
+ (setq emms-stream-info-header-flag t))))
+ emms-stream-info-vocab))
;; Look for title
(unless emms-stream-info-title-flag
diff -urx '*~' emms-3.0.orig/emms-tag-editor.el emms-3.0/emms-tag-editor.el
--- emms-3.0.orig/emms-tag-editor.el 2010-05-31 16:20:51.458823310 +0000
+++ emms-3.0/emms-tag-editor.el 2010-05-31 21:32:10.432826625 +0000
@@ -417,10 +417,10 @@
(setq filename (emms-track-name track))
(or fullname (setq filename (file-name-nondirectory filename)))
(when (string-match (car pattern) filename)
- (mapcar (lambda (pair)
- (emms-track-set track (car (rassoc (char-to-string (car
pair)) emms-tag-editor-tags))
- (match-string (cdr pair) filename)))
- (cdr pattern)))
+ (mapc (lambda (pair)
+ (emms-track-set track (car (rassoc (char-to-string (car
pair)) emms-tag-editor-tags))
+ (match-string (cdr pair) filename)))
+ (cdr pattern)))
(emms-tag-editor-insert-track track))))))
;;;###autoload
diff -urx '*~' emms-3.0.orig/Makefile emms-3.0/Makefile
--- emms-3.0.orig/Makefile 2010-05-31 16:20:53.158823378 +0000
+++ emms-3.0/Makefile 2010-05-31 16:30:20.670825783 +0000
@@ -8,13 +8,11 @@
TARGET=$(patsubst %.el,%.elc,$(SOURCE))
MAN1PAGES=emms-print-metadata.1
-DESTDIR=
-PREFIX=$(DESTDIR)/usr/local
-INFODIR=$(PREFIX)/info
-MAN1DIR=$(PREFIX)/share/man/man1
-SITELISP=$(PREFIX)/share/emacs/site-lisp/emms
+INFODIR=$(DESTDIR)/usr/share/info
+MAN1DIR=$(DESTDIR)/usr/share/man/man1
+SITELISP=$(DESTDIR)/usr/share/emacs/site-lisp/emms
-INSTALLINFO = /usr/sbin/install-info --info-dir=$(INFODIR)
+INSTALLINFO = /sbin/install-info --info-dir=$(INFODIR)
.PHONY: all install deb-install clean
.PRECIOUS: %.elc %.info %.html
@@ -49,6 +47,7 @@
install -m 644 $(ALLSOURCE) $(SITELISP)
install -m 644 $(ALLCOMPILED) $(SITELISP)
install -m 0644 emms.info $(INFODIR)/emms
+ test -d $(MAN1DIR) || mkdir -p $(MAN1DIR)
for p in $(MAN1PAGES) ; do $(GZIP) -9c $$p > $(MAN1DIR)/$$p.gz ; done
$(INSTALLINFO) emms.info
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [emms-help] Packaging as RPM and Makefile,
Tim Landscheidt <=