- fixed bug in home_etc patch

Changed files:
    moc-home_etc.patch -> 1.2
    moc.spec -> 1.32

diff --git a/moc-home_etc.patch b/moc-home_etc.patch
index acd9c4feb0b2f215bb2ea94dc15e73f9333ad881..5b8aee99689d2e0ecd0878d816dcdd8123847f7a 100644 (file)
--- a/moc-home_etc.patch
+++ b/moc-home_etc.patch
@@ -1,22 +1,13 @@
-diff -Nur moc-2.4.0-beta1.org/options.c moc-2.4.0-beta1/options.c
---- moc-2.4.0-beta1.org/options.c      2006-01-21 10:53:41.000000000 +0100
-+++ moc-2.4.0-beta1/options.c  2006-01-21 14:13:55.000000000 +0100
-@@ -137,7 +137,8 @@
- void options_init ()
- {
-       memset (options, 0, sizeof(options));
--
-+      char* moc_dir = getenv("HOME_ETC");
-+      strcat(moc_dir,"/.moc");
-       option_add_int ("ReadTags", 1);
-       option_add_str ("MusicDir", NULL);
-       option_add_int ("StartInMusicDir", 0);
-@@ -164,7 +165,7 @@
-       option_add_str ("Theme", NULL);
-       option_add_str ("XTermTheme", NULL);
-       option_add_str ("ForceTheme", NULL); /* Used when -T is set */
--      option_add_str ("MOCDir", "~/.moc");
-+      option_add_str ("MOCDir", moc_dir);
-       option_add_int ("UseMmap", 1);
-       option_add_int ("Precache", 1);
-       option_add_int ("SavePlaylist", 1);
+diff -Nur moc-2.4.1.org/common.c moc-2.4.1/common.c
+--- moc-2.4.1.org/common.c     2006-11-10 10:28:48.000000000 +0100
++++ moc-2.4.1/common.c 2006-11-13 00:42:09.000000000 +0100
+@@ -109,7 +109,8 @@
+       char *moc_dir = options_get_str ("MOCDir");
+       
+       if (moc_dir[0] == '~') {
+-              if (!(home_dir = getenv("HOME")))
++              if(!(home_dir=getenv("HOME_ETC")))
++                  if (!(home_dir = getenv("HOME")))
+                       fatal ("No HOME environmential variable.");
+               if (snprintf(fname, sizeof(fname), "%s/%s/%s", home_dir,
+                               (moc_dir[1] == '/') ? moc_dir + 2 : moc_dir + 1,

diff --git a/moc.spec b/moc.spec
index 91310cd84fbf816f30aa89603d43e8385a728764..b65f1d9f97d31bd460afc789186a039bb1c6c845 100644 (file)
--- a/moc.spec
+++ b/moc.spec
@@ -6,7 +6,7 @@ Summary:        Console audio player with simple ncurses interface
 Summary(pl):   Konsolowy odtwarzacz audio z prostym interfejsem ncurses
 Name:          moc
 Version:       2.4.1
-Release:       1
+Release:       2
 License:       GPL
 Group:         Applications/Sound
 Source0:       ftp://ftp.daper.net/pub/soft/moc/stable/%{name}-%{version}.tar.bz2