- fix building with other prefix that /usr/local

Changed files:
    3ddesktop-other_prefix.patch -> 1.1
    3ddesktop.spec -> 1.8

diff --git a/3ddesktop-other_prefix.patch b/3ddesktop-other_prefix.patch
new file mode 100644 (file)
index 0000000..da97e13
--- /dev/null
+++ b/3ddesktop-other_prefix.patch
@@ -0,0 +1,104 @@
+--- 3ddesktop-0.2.0/3ddeskd.cpp.wiget  Thu Aug  8 03:21:43 2002
++++ 3ddesktop-0.2.0/3ddeskd.cpp        Mon Aug 12 12:26:11 2002
+@@ -1773,7 +1773,7 @@
+ 
+     if (!load_image(filename, data, &sizex, &sizey, 1)) {
+ 
+-        sprintf (filename, "/usr/local/share/3ddesktop/digits.bmp");
++        sprintf (filename, SHAREDIR "/digits.bmp");
+ 
+         if (!load_image(filename, data, &sizex, &sizey, 1)) {
+ 
+--- 3ddesktop-0.2.0/config.hpp.wiget   Thu Aug  8 03:21:13 2002
++++ 3ddesktop-0.2.0/config.hpp Mon Aug 12 12:26:11 2002
+@@ -54,7 +54,7 @@
+            "                        priceisright, flip, or random)\n"
+            "    --acquire[=#]    Grab images for all the desktops by cycling thru\n"
+            "                       (sleep for # millisecs at each screen for refresh)\n"
+-           "    --dir=/path      the install dir if different than /usr/share/3ddesktop\n"
++           "    --dir=/path      the install dir if different than " SHAREDIR "\n"
+            "    --workspaces     switch between workspace desktops instead of grid areas\n"
+            "    --depth=#        specify how much to zoom out\n"
+            "    --randdelay=#    seconds before random movement (0 for none) 15 default\n"
+@@ -144,7 +144,7 @@
+         goto_column = NO_GOTO;
+         goto_row = NO_GOTO;
+ 
+-        strcpy(base_dir, "/usr/share/3ddesktop");
++        strcpy(base_dir, SHAREDIR);
+ 
+         digit_size = 50;
+         digit_color = COLOR_RED;
+@@ -508,21 +508,15 @@
+         FILE *fp = fopen(config_file, "r");
+         if (!fp) {
+ 
+-            sprintf(config_file, "/usr/local/share/3ddesktop/3ddesktop.conf");
++            sprintf(config_file, SYSCONFDIR "/3ddesktop.conf");
+             
+             fp = fopen(config_file, "r");
+             if (!fp) {
+                 
+-                sprintf(config_file, "/usr/share/3ddesktop/3ddesktop.conf");
+-        
+-                fp = fopen(config_file, "r");
+-                if (!fp) {
+-                
+-                    // don't error on this - may not be there
+-                    msgout (DEBUG, "Could not open config file: 3ddesktop.conf: %s\n", 
+-                            strerror(errno));
+-                    return;
+-                }
++                // don't error on this - may not be there
++                msgout (DEBUG, "Could not open config file: 3ddesktop.conf: %s\n", 
++                        strerror(errno));
++                return;
+             }
+         }
+ 
+--- 3ddesktop-0.2.0/Makefile.in.wiget  Mon Aug 12 12:26:11 2002
++++ 3ddesktop-0.2.0/Makefile.in        Mon Aug 12 12:26:41 2002
+@@ -33,17 +33,20 @@
+ CC = @CC@
+ CXX = @CXX@
+ 
+-CFLAGS = -Wall -I. @CFLAGS@ @imlib2_cflags@
+-#-I/usr/include/kde -I/usr/lib/qt-2.3.0/include 
+-CPPFLAGS = -g -Wall -O2 @X_CFLAGS@ @GL_CFLAGS@ @CPPFLAGS@ @imlib2_cflags@
+ LDFLAGS = @LDFLAGS@ 
+ LIBS = @LIBS@ @GL_LIBS@ @X_LIBS@ -lXxf86vm @imlib2_libs@
+ INSTALL = install
+ prefix = @prefix@
+-bindir = $(prefix)/bin
+-libdir = $(prefix)/lib
+-infodir = $(prefix)/info
+-sharedir = $(prefix)/share/3ddesktop
++bindir = @bindir@
++libdir = @libdir@
++infodir = @infodir@
++datadir = @datadir@
++sharedir = $(datadir)/3ddesktop
++sysconfdir = @sysconfdir@
++
++CFLAGS = $(OPT) -Wall -I. @CFLAGS@ @imlib2_cflags@ 
++#-I/usr/include/kde -I/usr/lib/qt-2.3.0/include 
++CPPFLAGS = -Wall @X_CFLAGS@ @GL_CFLAGS@ @CPPFLAGS@ @imlib2_cflags@ -DSHAREDIR=\"$(sharedir)\" -DSYSCONFDIR=\"$(sysconfdir)\"
+ 
+ SOURCES=3ddeskd.cpp xutil.cpp faceset.cpp util.cpp 
+ DOCS=README ChangeLog
+@@ -54,12 +57,13 @@
+ all: 3ddeskd 3ddesk
+ 
+ install: all
+-      $(INSTALL) -d $(DESTDIR)$(bindir) $(DESTDIR)$(sharedir)
++      $(INSTALL) -d $(DESTDIR)$(bindir) $(DESTDIR)$(sharedir) $(DESTDIR)$(sysconfdir)
+       $(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
+       $(top_srcdir)/mkinstalldirs $(DESTDIR)$(sharedir)
+       $(INSTALL) 3ddeskd $(DESTDIR)$(bindir)/3ddeskd
+       $(INSTALL) 3ddesk $(DESTDIR)$(bindir)/3ddesk
+-      $(INSTALL) digits.bmp 3ddesktop.conf $(DESTDIR)$(sharedir)
++      $(INSTALL) digits.bmp $(DESTDIR)$(sharedir)
++      $(INSTALL) 3ddesktop.conf $(DESTDIR)$(sysconfdir)
+ 
+ uninstall:
+       /bin/rm -f $(bindir)/3ddeskd $(bindir)/3ddesk

diff --git a/3ddesktop.spec b/3ddesktop.spec
index ce34cef13131286a9c4876214a47b9f2356c75e9..70939505f1f9a35a100c4694c1168d8d33a1751c 100644 (file)
--- a/3ddesktop.spec
+++ b/3ddesktop.spec
@@ -8,6 +8,7 @@ Group:          X11/Applications
 Source0:       http://www.systemtoolbox.com/bard/3ddesktop/dl/%{name}-%{version}.tar.gz
 Patch0:                %{name}-DESTDIR.patch
 Patch1:                %{name}-ac_fix.patch
+Patch2:                %{name}-other_prefix.patch
 URL:           http://www.systemtoolbox.com/bard/3ddesktop/
 BuildRequires: OpenGL-devel
 BuildRequires: glut-devel
@@ -41,6 +42,7 @@ ekrany. Dost
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 cp -f /usr/share/automake/missing .
@@ -48,7 +50,7 @@ aclocal
 %{__autoconf}
 CPPFLAGS="-I/usr/X11R6/include" ; export CPPFLAGS
 %configure
-%{__make}
+%{__make} OPT=""
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -62,4 +64,5 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc ChangeLog README TODO
 %attr(755,root,root) %{_bindir}/*
+%config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/*
 %{_datadir}/%{name}