rpms/notecase/FC-4 notecase-1.1.2-buildfix.patch, 1.1, 1.2 notecase.spec, 1.13, 1.14

[Ignacio Vazquez-Abrams (ivazquez)]

Author: ivazquez

Update of /cvs/extras/rpms/notecase/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20104

Modified Files:
	notecase-1.1.2-buildfix.patch notecase.spec 
Log Message:
Fix -debuginfo subpackage (#170970)

notecase-1.1.2-buildfix.patch:

Index: notecase-1.1.2-buildfix.patch
===================================================================
RCS file: /cvs/extras/rpms/notecase/FC-4/notecase-1.1.2-buildfix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- notecase-1.1.2-buildfix.patch	30 Oct 2005 06:34:10 -0000	1.1
+++ notecase-1.1.2-buildfix.patch	31 Oct 2005 06:37:25 -0000	1.2
@@ -1,5 +1,21 @@
---- notecase-1.1.2/Makefile.noupdatesrc	2005-10-22 09:22:44.000000000 -0400
-+++ notecase-1.1.2/Makefile	2005-10-30 01:42:44.000000000 -0400
+--- notecase-1.1.2/Makefile.buildfix	2005-10-22 09:22:44.000000000 -0400
++++ notecase-1.1.2/Makefile	2005-10-31 01:08:28.000000000 -0500
+@@ -32,13 +32,13 @@
+ 
+ #DEBUG=-g -D_DEBUG
+ CXX=g++
+-CFLAGS=-Wall
++#CFLAGS=-Wall
+ FLAGS=$(CFLAGS)
+ BIN=./bin
+ OBJ=./bin
+ 
+ # using "--as-needed" to cut down link requirements (check by "readelf -d /usr/bin/notecase | grep NEEDED") 
+-LOPTIMIZE=-Os -s -Wl,--as-needed
++LOPTIMIZE=-Os -Wl,--as-needed
+ 
+ # define compile/link command line with flags
+ CC=$(CXX) $(DEBUG) $(PROFILE) -DENABLE_NLS
 @@ -48,7 +48,7 @@
  # define default project to build
  #
@@ -18,7 +34,20 @@
  	$(LD) $(OBJS) -o $(BIN)/notecase $(FLAGS) $(LDFLAGS) $(GTKLIBS)
  	#strip $(BIN)/notecase
  
-@@ -279,7 +279,7 @@
+@@ -262,10 +262,8 @@
+ poinstall:
+ 	@for i in `ls po/*.po`; do \
+ 		rm -f po/messages.mo; \
+-		loc=`basename $$i`; \
+-		name_len=`expr length "$$loc"`; \
+-		name_len=`echo "$$name_len - 3" | bc`; \
+-		loc=`echo $$loc | cut -c -$$name_len`; \
++		loc=$${i%.po}; \
++		loc=$${loc#po*/}; \
+ 		msgfmt $$i -o po/messages.mo; \
+ 		install -D -m 644 po/messages.mo "$(prefix)/share/locale/$$loc/LC_MESSAGES/notecase.mo"; \
+ 	done; \
+@@ -279,7 +277,7 @@
  #
  # install application
  #


Index: notecase.spec
===================================================================
RCS file: /cvs/extras/rpms/notecase/FC-4/notecase.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- notecase.spec	30 Oct 2005 06:34:10 -0000	1.13
+++ notecase.spec	31 Oct 2005 06:37:25 -0000	1.14
@@ -25,6 +25,7 @@
 %setup -q
 %patch -p1 -b .buildfix
 find docs -type f -exec sed -i -e 's/\r//g' \{\} \;
+find src -type f -exec sed -i -e 's/\r//g' \{\} \;
 sed -i -e 's/\r//g' readme.txt
 %define ncdhelppath %(sed 's|^%{_prefix}||' <<< "%{_docdir}")
 sed -i -e 's!\(#define HELP_FILE_PATH\).*!\1 "%{ncdhelppath}/%{name}-%{version}/help.ncd"!
@@ -33,7 +34,7 @@
 sed -i 's:\#define INSTALL_PREFIX .*:\#define INSTALL_PREFIX "%{_prefix}"\r:' ./src/config.h
 
 %build
-make %{?_smp_mflags}
+make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -69,6 +70,7 @@
 %changelog
 * Sun Oct 30 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.1.2-1
 - Upstream update
+- Fix -debuginfo subpackage (#170970)
 
 * Sat Sep  3 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0.0-2
 - Fixed help file path (#166562)