update to 0.04

Makefile

@@ -1,9 +1,9 @@
 #############################################################################
 # Makefile for building: BerryCC
-# Generated by qmake (1.07a) (Qt 3.3.4) on: Sat Mar 11 16:52:53 2006
+# Generated by qmake (1.07a) (Qt 3.3.7) on: Thu Jan 18 17:52:54 2007
 # Project:  BerryCC.pro
 # Template: app
-# Command: $(QMAKE) -o Makefile Makefile BerryCC.pro
+# Command: $(QMAKE) -o Makefile BerryCC.pro
 #############################################################################
 
 ####### Compiler, tools and options
@@ -12,14 +12,14 @@ CC       = gcc
 CXX      = g++
 LEX      = flex
 YACC     = yacc
-CFLAGS   = -pipe -Wall -W -O2 -g -pipe -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -m32 -march=i386 -mtune=pentium4 -fasynchronous-unwind-tables  -DQT_NO_DEBUG -DQT_SHARED -DQT_THREAD_SUPPORT
-CXXFLAGS = -pipe -Wall -W -O2 -g -pipe -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -m32 -march=i386 -mtune=pentium4 -fasynchronous-unwind-tables  -DQT_NO_DEBUG -DQT_SHARED -DQT_THREAD_SUPPORT
+CFLAGS   = -pipe -Wall -W -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -m32 -march=i386 -mtune=generic -fasynchronous-unwind-tables  -DQT_NO_DEBUG -DQT_SHARED -DQT_THREAD_SUPPORT
+CXXFLAGS = -pipe -Wall -W -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -m32 -march=i386 -mtune=generic -fasynchronous-unwind-tables  -DQT_NO_DEBUG -DQT_SHARED -DQT_THREAD_SUPPORT
 LEXFLAGS = 
 YACCFLAGS= -d
 INCPATH  = -I/usr/lib/qt-3.3/mkspecs/default -I. -I$(QTDIR)/include -I.ui/ -I. -I.moc/
 LINK     = g++
 LFLAGS   = 
-LIBS     = $(SUBLIBS) -L$(QTDIR)/lib -L/usr/X11R6/lib -lqt-mt -lXext -lX11 -lm
+LIBS     = $(SUBLIBS) -L$(QTDIR)/lib -lqt-mt -lXext -lX11 -lm
 AR       = ar cqs
 RANLIB   = 
 MOC      = $(QTDIR)/bin/moc
@@ -55,8 +55,7 @@ UICDECLS = .ui/berry_control_centre.h
 UICIMPLS = .ui/berry_control_centre.cpp
 SRCMOC   = .moc/moc_berry_control_centre.cpp
 OBJMOC = .obj/moc_berry_control_centre.o
-DIST	   = Makefile \
-		BerryCC.pro
+DIST	   = BerryCC.pro
 QMAKE_TARGET = BerryCC
 DESTDIR  = 
 TARGET   = BerryCC
@@ -95,9 +94,9 @@ $(MOC):
 	( cd $(QTDIR)/src/moc && $(MAKE) )
 
 Makefile: BerryCC.pro  /usr/lib/qt-3.3/mkspecs/default/qmake.conf /usr/lib/qt-3.3/lib/libqt-mt.prl
-	$(QMAKE) -o Makefile Makefile BerryCC.pro
+	$(QMAKE) -o Makefile BerryCC.pro
 qmake: 
-	@$(QMAKE) -o Makefile Makefile BerryCC.pro
+	@$(QMAKE) -o Makefile BerryCC.pro
 
 dist: 
 	@mkdir -p .obj/BerryCC && $(COPY_FILE) --parents $(SOURCES) $(HEADERS) $(FORMS) $(DIST) .obj/BerryCC/ && $(COPY_FILE) --parents display.png krfb.png mycomputer.png .obj/BerryCC/ && $(COPY_FILE) --parents berry_control_centre.ui.h .obj/BerryCC/ && ( cd `dirname .obj/BerryCC` && $(TAR) BerryCC.tar BerryCC && $(GZIP) BerryCC.tar ) && $(MOVE) `dirname .obj/BerryCC`/BerryCC.tar.gz . && $(DEL_FILE) -r .obj/BerryCC

berry-controlcentre.spec

@@ -1,5 +1,5 @@
 %define name berry-controlcentre
-%define version 0.03
+%define version 0.04
 %define release b1
 
 Name:		%{name}
@@ -13,32 +13,16 @@ Buildroot:	%{_tmppath}/%{name}-%{version}
 
 BuildArchitectures: i586
 
-
 %description
 Control Centre for Berry Linux
 
-
-##
-## Setup Section
-##
-
 %prep
 %setup -q
 
-
-##
-## Build Section
-##
-
 %build
 qmake
 make
 
-
-##
-## Install Section
-##
-
 %install
 mkdir -p %{buildroot}/opt/berry
 strip BerryCC
@@ -47,30 +31,15 @@ install -m 755 BerryCC %{buildroot}/opt/berry/
 mkdir -p %{buildroot}/usr/share/applications/Berry
 install -m 644 *.desktop %{buildroot}/usr/share/applications/Berry
 
-
-##
-## Clean Section
-##
-
 %clean
 [ -n "%{buildroot}" -a "%{buildroot}" != / ] && rm -rf %{buildroot}
 rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 
-
-##
-## Files Section
-##
-
 %files
 %defattr (-,root,root)
 /opt/berry/*
 /usr/share/applications/Berry/*.desktop
 
-
-##
-## change log
-##
-
 %changelog
 * Wed Aug 31 2005 Yuichiro Nakada <[email protected]>
 - Create for Berry Linux