[svn] r3142 - in trunk/rpms: amule bbkeys blackbox mplayer-fonts pdflib pearpc perl-SDL python-imaging videolan-client xplanet-maps

packagers at lists.rpmforge.net packagers at lists.rpmforge.net
Wed Apr 20 14:07:02 CEST 2005


Author: thias
Date: 2005-04-20 14:06:58 +0200 (Wed, 20 Apr 2005)
New Revision: 3142

Modified:
   trunk/rpms/amule/amule.spec
   trunk/rpms/bbkeys/bbkeys.spec
   trunk/rpms/blackbox/blackbox.spec
   trunk/rpms/mplayer-fonts/mplayer-fonts.spec
   trunk/rpms/pdflib/pdflib.spec
   trunk/rpms/pearpc/pearpc.spec
   trunk/rpms/perl-SDL/perl-SDL.spec
   trunk/rpms/python-imaging/python-imaging.spec
   trunk/rpms/videolan-client/videolan-client.spec
   trunk/rpms/xplanet-maps/xplanet-maps.spec
Log:
Various minor cosmetic changes and trivial fixes.


Modified: trunk/rpms/amule/amule.spec
===================================================================
--- trunk/rpms/amule/amule.spec	2005-04-19 21:24:50 UTC (rev 3141)
+++ trunk/rpms/amule/amule.spec	2005-04-20 12:06:58 UTC (rev 3142)
@@ -15,7 +15,7 @@
 Requires(post): /usr/sbin/alternatives
 Requires(preun): /usr/sbin/alternatives
 BuildRequires: gcc-c++, wxGTK-devel, curl-devel >= 7.9.7, zlib-devel, gettext
-BuildRequires: gd-progs, gd-devel, libidn-devel
+BuildRequires: gd-progs, gd-devel, libidn-devel, libjpeg-devel
 # Required on Yellow Dog Linux 3.0
 BuildRequires: openssl-devel
 # Required for a configure check (curl)

Modified: trunk/rpms/bbkeys/bbkeys.spec
===================================================================
--- trunk/rpms/bbkeys/bbkeys.spec	2005-04-19 21:24:50 UTC (rev 3141)
+++ trunk/rpms/bbkeys/bbkeys.spec	2005-04-20 12:06:58 UTC (rev 3142)
@@ -40,8 +40,8 @@
 %{__rm} -rf %{buildroot}
 
 
-%files 
-%defattr(-, root, root, 0755) 
+%files
+%defattr(-, root, root, 0755)
 %doc AUTHORS BUGS ChangeLog LICENSE NEWS README TODO
 %{_bindir}/bbkeys
 %dir %{_datadir}/bbkeys/
@@ -49,8 +49,8 @@
 %config %{_datadir}/bbkeys/defaultStyle
 %{_mandir}/man?/*
 
- 
-%changelog 
+
+%changelog
 * Fri Apr  1 2005 Matthias Saou <http://freshrpms.net/> 0.9.0-1
 - Update to 0.9.0.
 
@@ -85,8 +85,8 @@
 - added to file list for newly included files (docs and man pages)
 - install to %{prefix} instead of /usr
 
-* Sun May 6 2001 Hollis Blanchard <hollis at terraplex.com> 
-- removed file list in favor of explicit %files section 
-- install to /usr instead of /usr/local 
+* Sun May 6 2001 Hollis Blanchard <hollis at terraplex.com>
+- removed file list in favor of explicit %files section
+- install to /usr instead of /usr/local
 - buildroot = /var/tmp/bbkeys-buildroot instead of /tmp/buildroot
 

Modified: trunk/rpms/blackbox/blackbox.spec
===================================================================
--- trunk/rpms/blackbox/blackbox.spec	2005-04-19 21:24:50 UTC (rev 3141)
+++ trunk/rpms/blackbox/blackbox.spec	2005-04-20 12:06:58 UTC (rev 3142)
@@ -53,7 +53,7 @@
 EOF
 
 # Install the desktop entry
-%{__install} -Dp -m644 %{SOURCE1} \
+%{__install} -D -p -m 0644 %{SOURCE1} \
     %{buildroot}%{_datadir}/xsessions/%{name}.desktop
 
 
@@ -98,7 +98,7 @@
 
 * Tue Feb 10 2004 Scott R. Godin <nospam at webdragon.net> 0.65.0-6
 - Patch for #include <cassert> in Window.cc
-- Fixed nls problem, left in --disable just in case. Smile, Matthias. :-) 
+- Fixed nls problem, left in --disable just in case. Smile, Matthias. :-)
 
 * Fri Nov 14 2003 Mattthias Saou <http://freshrpms.net/> 0.65.0-5
 - Rebuild for Fedora Core 1.

Modified: trunk/rpms/mplayer-fonts/mplayer-fonts.spec
===================================================================
--- trunk/rpms/mplayer-fonts/mplayer-fonts.spec	2005-04-19 21:24:50 UTC (rev 3141)
+++ trunk/rpms/mplayer-fonts/mplayer-fonts.spec	2005-04-20 12:06:58 UTC (rev 3142)
@@ -1,6 +1,5 @@
 # $Id$
 # Authority: matthias
-
 # Dist: nodist
 
 # Default font encoding, iso-8859-1 iso-8859-2 iso-8859-7 or cp1250
@@ -9,10 +8,10 @@
 # The default font size for subtitles : 14, 18, 24 or 28
 %define size 18
 
-Summary: Font files for MPlayer, the Movie Player for Linux
+Summary: Font files for MPlayer
 Name: mplayer-fonts
 Version: 1.1
-Release: 2
+Release: 3
 License: GPL
 Group: Applications/Multimedia
 URL: http://mplayerhq.hu/
@@ -25,41 +24,50 @@
 BuildArch: noarch
 
 %description
-MPlayer is a movie player. It plays most video formats as well as DVDs.
+MPlayer is a multimedia player. It plays most video formats as well as DVDs.
 Its big feature is the wide range of supported output drivers. There are also
 nice antialiased shaded subtitles and OSD.
 
 This package contains the fonts used for subtitles and OSD.
 
+
 %prep
 %setup -c %{name}-%{version} -a1 -a2 -a3
 
+
 %build
 
+
 %install
 %{__rm} -rf %{buildroot}
-mkdir -p %{buildroot}%{_datadir}/mplayer/
-cp -a * %{buildroot}%{_datadir}/mplayer/
+%{__mkdir_p} %{buildroot}%{_datadir}/mplayer/
+%{__cp} -a * %{buildroot}%{_datadir}/mplayer/
 # Make a symlink to the default font
-ln -s -f \
+%{__ln_s} -f \
     font-arial-%{font}/font-arial-%{size}-%{font} \
     %{buildroot}%{_datadir}/mplayer/font
 
+
+%clean
+%{__rm} -rf %{buildroot}
+
+
 %pre
-# We have a link... some have an empty dir, this fixes it!
+# We provide a symlink... some have an empty dir, this fixes it!
 [ -d %{_datadir}/mplayer/font ] && \
         rmdir %{_datadir}/mplayer/font 2>/dev/null || :
 
-%clean
-%{__rm} -rf %{buildroot}
 
 %files
 %defattr(0644, root, root, 0755)
-%dir %{_datadir}/mplayer
-%{_datadir}/mplayer/*
+%{_datadir}/mplayer/
 
+
 %changelog
-* Fri Nov  7 2003 Matthias Saou <http://freshrpms.net/> 1.1-2.fr
+* Sun Apr 17 2005 Matthias Saou <http://freshrpms.net/> 1.1-3
+- Minor spec file cleanups.
+
+* Fri Nov  7 2003 Matthias Saou <http://freshrpms.net/> 1.1-2
 - Rebuild for Fedora Core 1.
 
 * Wed Aug 13 2003 Matthias Saou <http://freshrpms.net/>

Modified: trunk/rpms/pdflib/pdflib.spec
===================================================================
--- trunk/rpms/pdflib/pdflib.spec	2005-04-19 21:24:50 UTC (rev 3141)
+++ trunk/rpms/pdflib/pdflib.spec	2005-04-20 12:06:58 UTC (rev 3142)
@@ -13,7 +13,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 # perl, python, tcl bindings are disabled on purpose : the goal was only to
 # get the php module built
-BuildRequires: libpng-devel, zlib-devel
+BuildRequires: zlib-devel, libpng-devel
 
 %description
 PDFlib is a C library for generating PDF files. It offers a graphics
@@ -27,7 +27,7 @@
 %package devel
 Summary: Development files for pdflib
 Group: Development/Libraries
-Requires: %{name} = %{version}
+Requires: %{name} = %{version}, zlib-devel, libpng-devel
 
 %description devel
 PDFlib is a C library for generating PDF files. It offers a graphics

Modified: trunk/rpms/pearpc/pearpc.spec
===================================================================
--- trunk/rpms/pearpc/pearpc.spec	2005-04-19 21:24:50 UTC (rev 3141)
+++ trunk/rpms/pearpc/pearpc.spec	2005-04-20 12:06:58 UTC (rev 3142)
@@ -10,13 +10,11 @@
 Group: Applications/Emulators
 License: GPL
 URL: http://pearpc.sourceforge.net/
-
 Source0: http://dl.sf.net/pearpc/pearpc-%{version}.tar.bz2
 Source1: http://pearpc.sourceforge.net/pearpc3.png
 Source2: http://dl.sf.net/pearpc/pearpc-3gib.img.bz2
 Source3: http://dl.sf.net/pearpc/pearpc-6gib.img.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-
 BuildRequires: XFree86-devel, SDL-devel
 BuildRequires: desktop-file-utils, gcc-c++
 %ifarch %{ix86}

Modified: trunk/rpms/perl-SDL/perl-SDL.spec
===================================================================
--- trunk/rpms/perl-SDL/perl-SDL.spec	2005-04-19 21:24:50 UTC (rev 3141)
+++ trunk/rpms/perl-SDL/perl-SDL.spec	2005-04-20 12:06:58 UTC (rev 3142)
@@ -13,8 +13,7 @@
 License: GPL
 Group: System Environment/Libraries
 URL: http://sdl.perl.org/
-
-Source: http://www.cpan.org/modules/by-module/SDL_Perl/SDL_Perl-%{version}.tar.gz
+Source: http://search.cpan.org/CPAN/authors/id/D/DG/DGOEHRIG/SDL_Perl-%{version}.tar.gz
 Source10: filter-depends.sh
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: SDL-devel, SDL_mixer-devel, SDL_image-devel, SDL_net-devel

Modified: trunk/rpms/python-imaging/python-imaging.spec
===================================================================
--- trunk/rpms/python-imaging/python-imaging.spec	2005-04-19 21:24:50 UTC (rev 3141)
+++ trunk/rpms/python-imaging/python-imaging.spec	2005-04-20 12:06:58 UTC (rev 3142)
@@ -65,7 +65,7 @@
 %files
 %defattr(-, root, root, 0755)
 %doc CHANGES* CONTENTS README Images/ Sane/ Scripts/
-%{python_sitearch}/PIL.path
+%{python_sitearch}/PIL.pth
 %{python_sitearch}/PIL/
 
 

Modified: trunk/rpms/videolan-client/videolan-client.spec
===================================================================
--- trunk/rpms/videolan-client/videolan-client.spec	2005-04-19 21:24:50 UTC (rev 3141)
+++ trunk/rpms/videolan-client/videolan-client.spec	2005-04-20 12:06:58 UTC (rev 3142)
@@ -68,6 +68,7 @@
 %{!?_without_dvbpsi:BuildRequires: libdvbpsi-devel}
 %{!?_without_ogg:BuildRequires: libogg-devel}
 %{!?_without_mad:BuildRequires: libmad-devel}
+%{!?_without_ffmpeg:BuildRequires: lame-devel}
 #{!?_without_ffmpeg:BuildRequires: lame-devel, faac-devel}
 %{!?_without_xvid:BuildRequires: xvidcore-devel}
 %{!?_without_a52:BuildRequires: a52dec-devel}
@@ -136,8 +137,8 @@
     %configure \
         --disable-shared \
         --enable-gpl \
-        --enable-pp
-#       --enable-mp3lame \
+        --enable-pp \
+        --enable-mp3lame
 #       --enable-faac
     %{__make} %{?_smp_mflags}
 popd
@@ -158,7 +159,7 @@
     %{?_without_ogg:--disable-ogg} \
     %{?_without_rawdv:--disable-rawdv} \
     %{!?_without_mad:--enable-mad} \
-    %{!?_without_ffmpeg:--enable-ffmpeg} \
+    %{!?_without_ffmpeg:--enable-ffmpeg --with-ffmpeg-mp3lame} \
     %{!?_without_ffmpeg:--with-ffmpeg-tree=ffmpeg-%{ffmpeg_date}} \
     %{!?_without_faad:--enable-faad} \
     %{!?_without_xvid:--enable-xvid} \

Modified: trunk/rpms/xplanet-maps/xplanet-maps.spec
===================================================================
--- trunk/rpms/xplanet-maps/xplanet-maps.spec	2005-04-19 21:24:50 UTC (rev 3141)
+++ trunk/rpms/xplanet-maps/xplanet-maps.spec	2005-04-20 12:06:58 UTC (rev 3142)
@@ -1,6 +1,5 @@
 # $Id$
 # Authority: matthias
-
 # Dist: nodist
 
 Summary: Additional maps for Xplanet, the planet image rendering program
@@ -30,10 +29,10 @@
 
 %install
 %{__rm} -rf %{buildroot}
-mkdir -p %{buildroot}%{_datadir}/
+%{__mkdir_p} %{buildroot}%{_datadir}
 # Already included with xplanet
 %{__rm} -f usr/local/share/xplanet/images/earth.jpg
-cp -a usr/local/share/xplanet %{buildroot}%{_datadir}/
+%{__cp} -a usr/local/share/xplanet %{buildroot}%{_datadir}/
 
 
 %clean
@@ -41,14 +40,14 @@
 
 
 %files
-%defattr(-, root, root, 0755)
-%{_datadir}/xplanet
+%defattr(0644, root, root, 0755)
+%{_datadir}/xplanet/
 
 
 %changelog
-* Tue Mar 16 2004 Matthias Saou <http://freshrpms.net> 1.0-2.fr
+* Tue Mar 16 2004 Matthias Saou <http://freshrpms.net> 1.0-2
 - Remove conflicting earth.jpg file.
 
-* Thu Mar  4 2004 Matthias Saou <http://freshrpms.net> 1.0-1.fr
+* Thu Mar  4 2004 Matthias Saou <http://freshrpms.net> 1.0-1
 - Initial spec file.
 




More information about the commits mailing list