dist-git conversion

#2781)

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: xmms-cdread
-# $Id$
-NAME := xmms-cdread
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON	:= $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Rootx && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

xmms-cdread.spec

@@ -1,59 +1,90 @@
 %define		xmmsdep %(rpm -q --qf "%%{epoch}:%%{version}" xmms-devel)
 %define		xmmsinputdir %(xmms-config --input-plugin-dir)
-
 Summary:	Digital audio CD input plugin for XMMS
 Name:		xmms-cdread
 Version:	0.14
-Release: 	0.fdr.4.a.2
-Epoch:		0
-License:	GPL
+Release:	16%{?dist}
+License:	GPLv2+
 Group:		Applications/Multimedia
 URL:		http://www.xmms.org/
 Source:		ftp://ftp.stack.nl/pub/users/willem/xmms-cdread-0.14a.tar.gz
 Patch1:		xmms-cdread-shuffle.patch
-Requires:	xmms = %xmmsdep
-BuildRequires:	gtk+-devel glib-devel xmms-devel
+Patch2:		xmms-cdread-x86_64.patch
+Requires:	xmms-libs
+BuildRequires:	gtk+-devel glib-devel xmms-devel automake libtool
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
 
-#---------------------------------------------------------------------
 %description
 XMMS is a multimedia (Ogg Vorbis, CDs) player for the X Window System
 with an interface similar to Winamp's. XMMS supports playlists and
-streaming content and has a configurable interface. 
+streaming content and has a configurable interface.
 
 This is the input plugin needed to play audio CDs digitally, i.e. without a
 connecting cable between the CD drive and sound card.
 
-#---------------------------------------------------------------------
 %prep
 %setup -q -n %{name}-%{version}a
-%patch1 -p1 -b .shuffle
+%patch1 -p1
+%patch2 -p1
 
-#---------------------------------------------------------------------
 %build
+autoreconf -i -f
 %configure --libdir=%{xmmsinputdir}
 perl -pi -e 's/^(CFLAGS.*)-O2(.*)/$1\$\(RPM_OPT_FLAGS\)$2/' Makefile
 make %{?_smp_mflags}
 
-#---------------------------------------------------------------------
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-#---------------------------------------------------------------------
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-#---------------------------------------------------------------------
-%files 
+%files
 %defattr(-,root,root)
 %doc AUTHORS COPYING NEWS README TODO
 %{xmmsinputdir}/libcdread.so
 %exclude %{xmmsinputdir}/libcdread.la
 
-#---------------------------------------------------------------------
 %changelog
+* Tue Mar 03 2009 Robert Scheck <robert@fedoraproject.org> - 0.14-16
+- Solve the x86_64-redhat-linux-gnu configure target error
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.14-15
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Mon Aug 11 2008 Jason L Tibbitts III <tibbs@math.uh.edu> - 0.14-14
+- Fix license tag.
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 0.14-13
+- Autorebuild for GCC 4.3
+
+* Wed Aug 30 2006 Joost Soeterbroek <fedora@soeterbroek.com> - 0.14-12
+- rebuild for Fedora Extras 6
+
+* Thu Apr 13 2006 Joost Soeterbroek <fedora@soeterbroek.com> - 0.14-11
+- bumped release to stay in sync with FC-4
+
+* Sat Apr  8 2006 Joost Soeterbroek <fedora@soeterbroek.com> - 0.14-10
+- changed Requires xmms -> xmms-libs
+
+* Sun Mar  5 2006 Joost Soeterbroek <fedora@soeterbroek.com> - 0.14-9
+- x86_64 fixes 
+
+* Sat Mar  4 2006 Joost Soeterbroek <fedora@soeterbroek.com> - 0.14-8
+- added libtool --finish
+- added dist after release
+
+* Wed Mar  1 2006 Joost Soeterbroek <fedora@soeterbroek.com> - 0.14-7
+- rebuild for Fedora Extras 5
+
+* Sun May 22 2005 Jeremy Katz <katzj@redhat.com> - 0.14-6.a
+- rebuild on all arches
+
+* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+- rebuilt
+
 * Mon Nov 24 2003 Michael Schwendt <mschwendt[AT]users.sf.net> 0:0.14-0.fdr.4.a
 - Add XMMS 1.2.8 compat.patch from Mandrake Contrib,
   removes calls to private playlist_generate_shuffle_list().