Well now you stomped all over Charles's update.  What is this, like the 10th time 
you've uploaded 805a-1mdk?

Olivier Blin wrote:
> [Contrib-RPM]
> Name        : neverball                    Relocations: (not relocateable)
> Version     : 0805a                             Vendor: MandrakeSoft
> Release     : 1mdk                          Build Date: Fri Aug 15 03:17:56 2003
> -=-=-=-
> Olivier Blin <[EMAIL PROTECTED]> 0805a-1mdk 
> 
> - Initial release for Mandrake
> - Patch to fix wrong X11 library dir
> 
> -=-=-=-
> No rpmlint error, happy man :-)
> 
> -=-=-=-
> neverball-16.png removed
> neverball-32.png removed
> neverball-48.png removed
> neverball.spec changed
> neverball_X11_path.patch changed
> --- neverball-0.25.1-1mdk.src.rpm/neverball.spec      2003-08-31 00:00:42.000000000 
> +0200
> +++ neverball-0805a-1mdk.src.rpm/neverball.spec       2003-08-31 00:00:42.000000000 
> +0200
> @@ -1,21 +1,14 @@
>  Name:                neverball
>  Summary:     NeverBall arcade game
> -Version:     0.25.1
> +Version:     0805a
>  Release:     1mdk
>  Url:         http://aoeu.snth.net/neverball/
> -Source0:     %{name}-%{version}.tar.bz2
> -Source1:     %{name}-48.png
> -Source2:     %{name}-32.png
> -Source3:     %{name}-16.png
> +Source:              %name-%version.tar.gz
>  Patch0:              neverball_X11_path.patch.bz2
>  Group:               Games/Arcade
>  License:     GPL
> -Epoch:               1
>  BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-buildroot
> -BuildRequires:       SDL_mixer-devel
> -BuildRequires:       SDL_image-devel
> -BuildRequires:       SDL_ttf-devel
> -BuildRequires:       libMesaGLU-devel
> +BuildRequires:       SDL-devel, SDL_mixer-devel, SDL_image-devel, SDL_ttf-devel
>  
>  %description
>  Tilt the floor to roll the ball through the obstacle course
> @@ -26,7 +19,7 @@
>  (OpenGL 1.2.1 or greater) is required.
>  
>  %prep
> -%setup -q
> +%setup -q -n %{name}
>  %patch
>  
>  %build
> @@ -37,71 +30,29 @@
>  mkdir -p $RPM_BUILD_ROOT%{_libdir}/
>  cp -a %{name} $RPM_BUILD_ROOT%{_libdir}/
>  mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/data/
> -cp -a data/{levels.txt,back,mtrl,png,shot,snd,sol,ttf} 
> $RPM_BUILD_ROOT%{_datadir}/%{name}/data/
> -
> +cp -a data/{levels.txt,back,mtrl,png,snd,sol,ttf} 
> $RPM_BUILD_ROOT%{_datadir}/%{name}/data/
>  mkdir -p $RPM_BUILD_ROOT%{_bindir}/
> -cat > $RPM_BUILD_ROOT%{_bindir}/%{name} << EOF
> +
> +cat << EOF > $RPM_BUILD_ROOT%{_bindir}/%{name}
>  #!/bin/sh
>  cd %{_datadir}/%{name}
>  %{_libdir}/%{name}
>  EOF
> -chmod +x $RPM_BUILD_ROOT%{_bindir}/%{name}
> -
> -mkdir -p $RPM_BUILD_ROOT%{_menudir}
> -cat > $RPM_BUILD_ROOT%{_menudir}/%{name} << EOF
> -?package(%{name}): command="%{name}" icon="%{name}.png" section="Amusement/Arcade" 
> title="Neverball" longtitle="Tilt the floor to roll the ball" needs="x11"
> -EOF
>  
> -install -D -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_liconsdir}/%{name}.png
> -install -D -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_iconsdir}/%{name}.png
> -install -D -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_miconsdir}/%{name}.png
> +chmod +x $RPM_BUILD_ROOT%{_bindir}/%{name}
>  
>  %clean
>  rm -rf $RPM_BUILD_ROOT
>  
> -%post
> -%update_menus
> -
> -%postun
> -%clean_menus
> -
>  %files
>  %defattr(-,root,root)
> -%doc CHANGES COPYING MAPPING README
> -# do not package TODO to make rpmlint happy (zero size)
> +%doc COPYING.txt MAPPING.txt README.txt
>  %{_bindir}/%{name}
>  %{_libdir}/%{name}
>  %dir %{_datadir}/%{name}
>  %{_datadir}/%{name}
> -%{_menudir}/%{name}
> -%{_liconsdir}/%{name}.png
> -%{_iconsdir}/%{name}.png
> -%{_miconsdir}/%{name}.png
>  
>  %changelog
> -
> -* Sat Aug 30 2003 Charles A Edwards <[EMAIL PROTECTED]> 0.25.1-1mdk
> -- from Olivier Blin and G�tz Waschk :
> -  * Sat Aug 30 2003 Olivier Blin <[EMAIL PROTECTED]> 0.25.1-1mdk
> -  - Release 0.25.1
> -  - Drop patch1 (merged upstream)
> -
> -  * Thu Aug 28 2003 G�tz Waschk <[EMAIL PROTECTED]> 0.25.0-2mdk
> -  - fix buildrequires
> -  - add an epoch
> -
> -  * Thu Aug 28 2003 Olivier Blin <[EMAIL PROTECTED]> 0.25.0-1mdk
> -  - Release 0.25.0
> -  - Added patch for Radeon cards (patch1)
> -
> -  * Thu Aug 21 2003 Olivier Blin <[EMAIL PROTECTED]> 0.21.0-1mdk
> -  - Release 0.21.0
> -  - Regenerate patch0
> -
> -  * Fri Aug 15 2003 Olivier Blin <[EMAIL PROTECTED]> 0805a-2mdk
> -  - Added homemade icon
> -  - Added menu entry
> -
> -* Wed Aug 13 2003 Olivier Blin <[EMAIL PROTECTED]> 0805a-1mdk
> +* Wed Aug 13 2003 Olivier Blin <[EMAIL PROTECTED]> 0805a-1mdk 
>  - Initial release for Mandrake
>  - Patch to fix wrong X11 library dir
> reverted:
> --- Makefile  2003-08-21 04:55:29.000000000 +0200
> +++ Makefile.orig     2003-08-18 20:36:20.000000000 +0200
> @@ -4,7 +4,7 @@
>  # Maybe you need one of these.  Maybe you don't.
>  
>  #X11_PATH= -L/usr/X11/lib
> +#X11_PATH= -L/usr/X11R6/lib
> -X11_PATH= -L/usr/X11R6/lib
>  
>  #------------------------------------------------------------------------------
>  
> only in patch2:
> unchanged:
> --- src/Makefile.orig 2003-08-06 01:02:43.000000000 +0200
> +++ src/Makefile      2003-08-15 00:42:40.000000000 +0200
> @@ -22,7 +22,7 @@
>  
>  CFLAGS= -Wall -O2 -ffast-math -ansi $(shell sdl-config --cflags)
>  
> -X11_LIBS= -L/usr/X11/lib -lGLU -lGL -lm
> +X11_LIBS= -L/usr/X11R6/lib -lGLU -lGL -lm
>  SDL_LIBS= $(shell sdl-config --libs)
>  
>  GAME_LIBS= $(SDL_LIBS) -lSDL_image -lSDL_ttf -lSDL_mixer -lfreetype $(X11_LIBS)
> 
> 


Reply via email to