Hello community, here is the log from the commit of package xnetload checked in at Mon May 29 01:25:37 CEST 2006. -------- --- xnetload/xnetload.changes 2006-01-25 21:43:18.000000000 +0100 +++ xnetload/xnetload.changes 2006-05-26 20:52:41.000000000 +0200 @@ -1,0 +2,7 @@ +Fri May 26 20:51:44 CEST 2006 - schwab@suse.de + +- Don't build as root. +- Use RPM_OPT_FLAGS. +- Don't strip binaries. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xnetload.spec ++++++ --- /var/tmp/diff_new_pack.PEinXu/_old 2006-05-29 01:24:46.000000000 +0200 +++ /var/tmp/diff_new_pack.PEinXu/_new 2006-05-29 01:24:46.000000000 +0200 @@ -1,14 +1,14 @@ # # spec file for package xnetload (Version 1.11.3) # -# Copyright (c) 2003 SuSE Linux AG, Nuernberg, Germany. +# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://www.suse.de/feedback/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# usedforbuild aaa_base acl attr bash bind9-utils bison cpio cpp cvs cyrus-sasl cyrus-sasl2 db devs diffutils e2fsprogs file filesystem fileutils fillup findutils flex gawk gdbm-devel glibc glibc-devel glibc-locale gpm grep groff gzip insserv kbd less libacl libattr libgcc libstdc++ libxcrypt m4 make man mktemp modutils ncurses ncurses-devel net-tools netcfg pam pam-devel pam-modules patch permissions ps rcs readline sed sendmail sh-utils shadow strace syslogd sysvinit tar texinfo textutils timezone unzip util-linux vim zlib-devel XFree86 XFree86-devel XFree86-libs autoconf automake binutils bzip2 cracklib gcc gdbm gettext libtool perl rpm zlib +# norootforbuild Name: xnetload BuildRequires: xorg-x11 xorg-x11-devel @@ -17,16 +17,17 @@ Autoreqprov: on URL: http://www.xs4all.nl/~rsmith/software/ Version: 1.11.3 -Release: 0 +Release: 265 Summary: This program displays network traffic and uptime for the network Source: http://www.xs4all.nl/~rsmith/software/xnetload-%{version}.tar.bz2 Patch: xnetload-%{version}.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description -This program displays network traffic -and uptime for the network connection -named on the command line. +This program displays network traffic and uptime for the network +connection named on the command line. + + Authors: -------- @@ -40,7 +41,6 @@ make LIBNAME="%{_lib}" %install -[ -d %{buildroot} -a "%{buildroot}" != "" ] && rm -rf %{buildroot} mkdir -p $RPM_BUILD_ROOT/usr/X11R6/{bin,%{_lib}/X11/app-defaults} mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1 make install BINDIR=$RPM_BUILD_ROOT/usr/X11R6/bin \ @@ -51,12 +51,17 @@ [ -d %{buildroot} -a "%{buildroot}" != "" ] && rm -rf %{buildroot} %files +%defattr(-,root,root) %doc COPYING README ChangeLog /usr/X11R6/bin/xnetload %doc %{_mandir}/man1/xnetload.1.gz %config /usr/X11R6/%{_lib}/X11/app-defaults/XNetload %changelog -n xnetload +* Fri May 26 2006 - schwab@suse.de +- Don't build as root. +- Use RPM_OPT_FLAGS. +- Don't strip binaries. * Wed Jan 25 2006 - mls@suse.de - converted neededforbuild to BuildRequires * Tue Feb 04 2003 - postadal@suse.cz ++++++ xnetload-1.11.3.patch ++++++ --- /var/tmp/diff_new_pack.PEinXu/_old 2006-05-29 01:24:46.000000000 +0200 +++ /var/tmp/diff_new_pack.PEinXu/_new 2006-05-29 01:24:46.000000000 +0200 @@ -1,12 +1,14 @@ --- Makefile +++ Makefile -@@ -14,7 +14,8 @@ +@@ -13,8 +13,9 @@ + #LFLAGS = -pipe -L/usr/X11R6/lib # The next two lines are for building an optimized and stripped program. - CFLAGS = -pipe -O2 -Wall -DNDEBUG -I/usr/X11R6/include +-CFLAGS = -pipe -O2 -Wall -DNDEBUG -I/usr/X11R6/include -LFLAGS = -s -pipe -L/usr/X11R6/lib ++CFLAGS = -pipe -O2 -Wall $(RPM_OPT_FLAGS) -DNDEBUG -I/usr/X11R6/include +LIBNAME = lib -+LFLAGS = -s -pipe -L/usr/X11R6/$(LIBNAME) ++LFLAGS = -pipe -L/usr/X11R6/$(LIBNAME) # These three lines are for building Athlon optimized programs on my system. #CC=gcc-3.1 @@ -19,3 +21,14 @@ # Location where to install the binary. BINDIR = /usr/local/bin +@@ -86,10 +87,6 @@ + + # Install the program and manual page. You should be root to do this. + install: $(BASENAME) +- @if [ `id -u` != 0 ]; then \ +- echo "You must be root to install the program!"; \ +- exit 1; \ +- fi + install -m 755 $(BASENAME) $(BINDIR) + if [ -e $(BASENAME).1 ]; then \ + install -m 644 $(BASENAME).1 $(MANDIR); \ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...
participants (1)
-
root＠suse.de