rpms/calendar/devel Makefile.linux,1.1,1.2 calendar.spec,1.3,1.4

[David Cantrell]

Author: dcantrel

Update of /cvs/pkgs/rpms/calendar/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25180

Modified Files:
	Makefile.linux calendar.spec 
Log Message:
* Thu Apr 09 2009 David Cantrell <dcantrell at redhat.com> - 1.25-6
- Honor RPM_OPT_FLAGS and fix debuginfo (#494717)



Index: Makefile.linux
===================================================================
RCS file: /cvs/pkgs/rpms/calendar/devel/Makefile.linux,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.linux	20 Feb 2009 19:52:08 -0000	1.1
+++ Makefile.linux	9 Apr 2009 19:28:38 -0000	1.2
@@ -4,7 +4,7 @@
 MANDIR  = /usr/share/man
 
 CC      = gcc
-CFLAGS  += -O2 -Wall -D_GNU_SOURCE -DTM_YEAR_BASE=1900
+CFLAGS  = $(RPM_OPT_FLAGS) -D_GNU_SOURCE -DTM_YEAR_BASE=1900
 
 SRCS    = calendar.c io.c day.c pesach.c ostern.c paskha.c
 OBJS    = $(SRCS:.c=.o)
@@ -33,7 +33,7 @@
 		cd ../../ ; \
 	done
 	mkdir -p $(DESTDIR)/$(BINDIR) ; \
-	install -s -m 0755 calendar $(DESTDIR)/$(BINDIR)/calendar ; \
+	install -m 0755 calendar $(DESTDIR)/$(BINDIR)/calendar ; \
 	mkdir -p $(DESTDIR)/$(MANDIR)/man1 ; \
 	install -m 0644 calendar.1 $(DESTDIR)/$(MANDIR)/man1/calendar.1
 


Index: calendar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/calendar/devel/calendar.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- calendar.spec	4 Mar 2009 05:19:18 -0000	1.3
+++ calendar.spec	9 Apr 2009 19:28:38 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: Reminder utility
 Name:    calendar
 Version: 1.25
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: BSD
 Group:   Applications/Productivity
 URL:     http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/calendar
@@ -58,6 +58,9 @@
 %{_datadir}/calendar
 
 %changelog
+* Thu Apr 09 2009 David Cantrell <dcantrell at redhat.com> - 1.25-6
+- Honor RPM_OPT_FLAGS and fix debuginfo (#494717)
+
 * Tue Mar 03 2009 David Cantrell <dcantrell at redhat.com> - 1.25-5
 - Convert output to locale's character coding