Implemented spec file changes suggested by SuSE to make the
RPMs more solid.
This commit is contained in:
		| @@ -29,6 +29,8 @@ TARGET_CFG = Release | ||||
| DEFINES = -DNDEBUG | ||||
| endif | ||||
|  | ||||
| CFLAGS += -Wno-format-extra-args -fno-strict-aliasing -fshort-wchar | ||||
|  | ||||
| # Override the link setting for C++ | ||||
| LINK = g++ | ||||
|  | ||||
| @@ -55,7 +57,6 @@ CPPFILES = server.cpp | ||||
| CSFILES_CSC := | ||||
| INCLUDES = -I. -I$(ROOT)/include -I$(JAVA_INCDIR) | ||||
| RESOURCES = | ||||
| DEFINES += -fno-strict-aliasing -fshort-wchar  | ||||
| CFLAGS += $(INCLUDES) $(DEFINES) | ||||
| CPPFLAGS += -fPIC $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS) | ||||
| LIBS = -lpthread -lcasa_s_ipc -ljvm -ljsig -lj9thr23 | ||||
| @@ -64,7 +65,7 @@ LDFLAGS = -L$(LIBDIR)/$(TARGET_CFG) -L$(JAVA_LIBDIR) -L$(JAVA_LIBDIR)/classic | ||||
| OBJDIR = ./$(TARGET_CFG)/$(LIB) | ||||
| OBJS = $(addprefix $(OBJDIR)/, $(CFILES:%.c=%.o)) $(addprefix $(OBJDIR)/, $(CPPFILES:%.cpp=%.o)) | ||||
|  | ||||
| EXTRA_DIST = $(CFILES) $(CPPFILES) *.h CasaAuthtokenValidateD | ||||
| EXTRA_DIST = $(CFILES) $(CPPFILES) *.h CasaAuthtokenValidateD envvars | ||||
|  | ||||
| CUR_DIR := $(shell pwd) | ||||
|  | ||||
|   | ||||
| @@ -0,0 +1,35 @@ | ||||
| ############################################################ | ||||
| #                                                          # | ||||
| # Environment variable file for casa_atvd.                 # | ||||
| #                                                          # | ||||
| # Note: This file is sourced by the casa_atvd rc script    # | ||||
| # when starting the service.                               # | ||||
| #                                                          # | ||||
| # The following variables are utilized by the daemon       # | ||||
| # and its rc script:                                       # | ||||
| #                                                          # | ||||
| #   DAEMON_NO_AUTORESTART_AFTER_CRASH -                    # | ||||
| #                                                          # | ||||
| #   Set this variable to "1" if you want to disable the    # | ||||
| #   auto-restart daemon after abnormal termination         # | ||||
| #   feature. This variable is intended to facilitate       # | ||||
| #   the discovery of problems during quality assurance     # | ||||
| #   testing. Disabling of the auto-restart daemon after    # | ||||
| #   abnormal termination feature will result in a          # | ||||
| #   configuration that is less fault tolerant.             # | ||||
| #                                                          # | ||||
| #   DAEMON_COREDUMPS_WANTED -                              # | ||||
| #                                                          # | ||||
| #   Set this variable to allow core dumps to be taken      # | ||||
| #   when a daemon terminates abnormally. This variable     # | ||||
| #   is only meaningful when the auto-restart daemon        # | ||||
| #   feature mentioned above is enabled. Core dumps are     # | ||||
| #   allowed to be taken when the auto-restart daemon       # | ||||
| #   feature is disabled. Core dumps of novell-xsrvd        # | ||||
| #   service processes are taken to the                     # | ||||
| #   /var/novell/xtier folder.                              # | ||||
| #                                                          # | ||||
| ############################################################ | ||||
| LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}":/usr/lib/jvm/java-1.5.0-ibm/jre/bin:/usr/lib/jvm/java-1.5.0-ibm/jre/bin/classic | ||||
| export LD_LIBRARY_PATH | ||||
|  | ||||
| @@ -23,10 +23,14 @@ | ||||
| if DEBUG | ||||
| TARGET_CFG = Debug | ||||
| CFLAGS += -v -w | ||||
| DEFINES = -DDBG | ||||
| else | ||||
| TARGET_CFG = Release | ||||
| DEFINES = -DNDEBUG | ||||
| endif | ||||
|  | ||||
| CFLAGS += -Wno-format-extra-args -fno-strict-aliasing  | ||||
|  | ||||
| SUBDIRS = | ||||
|  | ||||
| DIST_SUBDIRS = | ||||
| @@ -55,7 +59,6 @@ CFILES = ../config.c \ | ||||
| CSFILES_CSC := | ||||
| INCLUDES = -I. -I.. -I$(CASAINCLUDE) -I../../../include | ||||
| RESOURCES = | ||||
| DEFINES = -fno-strict-aliasing  | ||||
| if LIB64 | ||||
| DEFINES += -D_LIB64 | ||||
| endif | ||||
|   | ||||
		Reference in New Issue
	
	Block a user