rpms/ndiswrapper-kmod/F-17 ndiswrapper-kmod.spec,1.84,1.85
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/ndiswrapper-kmod/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv15395
Modified Files:
ndiswrapper-kmod.spec
Log Message:
* Mon Oct 08 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.57-2.29
- Rebuilt for updated kernel
Index: ndiswrapper-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/ndiswrapper-kmod/F-17/ndiswrapper-kmod.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- ndiswrapper-kmod.spec 3 Oct 2012 18:34:32 -0000 1.84
+++ ndiswrapper-kmod.spec 8 Oct 2012 18:54:54 -0000 1.85
@@ -10,7 +10,7 @@
Summary: Ndiswrapper kernel module
Name: ndiswrapper-kmod
Version: 1.57
-Release: 2%{?dist}.28
+Release: 2%{?dist}.29
License: GPLv2
Group: System Environment/Kernel
URL: http://ndiswrapper.sourceforge.net
@@ -77,6 +77,9 @@
%changelog
+* Mon Oct 08 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.57-2.29
+- Rebuilt for updated kernel
+
* Wed Oct 03 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.57-2.28
- Rebuilt for updated kernel
11 years, 6 months
rpms/buildsys-build-rpmfusion/F-17 buildsys-build-rpmfusion-kerneldevpkgs-current, 1.52, 1.53 buildsys-build-rpmfusion.spec, 1.66, 1.67
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/buildsys-build-rpmfusion/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv14141
Modified Files:
buildsys-build-rpmfusion-kerneldevpkgs-current
buildsys-build-rpmfusion.spec
Log Message:
* Mon Oct 08 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 10:17-22
- rebuild for kernel 3.5.6-1.fc17
Index: buildsys-build-rpmfusion-kerneldevpkgs-current
===================================================================
RCS file: /cvs/free/rpms/buildsys-build-rpmfusion/F-17/buildsys-build-rpmfusion-kerneldevpkgs-current,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- buildsys-build-rpmfusion-kerneldevpkgs-current 3 Oct 2012 18:13:43 -0000 1.52
+++ buildsys-build-rpmfusion-kerneldevpkgs-current 8 Oct 2012 18:29:34 -0000 1.53
@@ -1,3 +1,3 @@
-3.5.5-2.fc17
-3.5.5-2.fc17smp
-3.5.5-2.fc17PAE
+3.5.6-1.fc17
+3.5.6-1.fc17smp
+3.5.6-1.fc17PAE
Index: buildsys-build-rpmfusion.spec
===================================================================
RCS file: /cvs/free/rpms/buildsys-build-rpmfusion/F-17/buildsys-build-rpmfusion.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- buildsys-build-rpmfusion.spec 3 Oct 2012 18:13:43 -0000 1.66
+++ buildsys-build-rpmfusion.spec 8 Oct 2012 18:29:35 -0000 1.67
@@ -3,7 +3,7 @@
Name: buildsys-build-%{repo}
Epoch: 10
Version: 17
-Release: 21
+Release: 22
Summary: Tools and files used by the %{repo} buildsys
Group: Development/Tools
@@ -86,6 +86,9 @@
%changelog
+* Mon Oct 08 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 10:17-22
+- rebuild for kernel 3.5.6-1.fc17
+
* Wed Oct 03 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 10:17-21
- rebuild for kernel 3.5.5-2.fc17
11 years, 6 months
rpms/ffmpeg/F-18 .cvsignore, 1.36, 1.37 ffmpeg.spec, 1.66, 1.67 sources, 1.36, 1.37
by Julian Sikorski
Author: belegdol
Update of /cvs/free/rpms/ffmpeg/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv12664
Modified Files:
.cvsignore ffmpeg.spec sources
Log Message:
* Thu Oct 04 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.11.2-1
- Updated to 0.11.2
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/F-18/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- .cvsignore 14 Jun 2012 17:21:18 -0000 1.36
+++ .cvsignore 8 Oct 2012 17:49:20 -0000 1.37
@@ -1 +1 @@
-ffmpeg-0.11.1.tar.bz2
+ffmpeg-0.11.2.tar.bz2
Index: ffmpeg.spec
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/F-18/ffmpeg.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- ffmpeg.spec 9 Sep 2012 16:36:06 -0000 1.66
+++ ffmpeg.spec 8 Oct 2012 17:49:20 -0000 1.67
@@ -11,8 +11,8 @@
Summary: Digital VCR and streaming server
Name: ffmpeg
-Version: 0.11.1
-Release: 3%{?date}%{?date:git}%{?rel}%{?dist}
+Version: 0.11.2
+Release: 1%{?date}%{?date:git}%{?rel}%{?dist}
%if 0%{?_with_amr:1}
License: GPLv3+
%else
@@ -280,6 +280,9 @@
%changelog
+* Thu Oct 04 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.11.2-1
+- Updated to 0.11.2
+
* Wed Sep 05 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.11.1-3
- Rebuilt for x264 ABI 125
Index: sources
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/F-18/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources 14 Jun 2012 17:21:18 -0000 1.36
+++ sources 8 Oct 2012 17:49:20 -0000 1.37
@@ -1 +1 @@
-ff8cb914f657e164dd60ea1008b555a8 ffmpeg-0.11.1.tar.bz2
+93c1908022567b321df74db7214da6ac ffmpeg-0.11.2.tar.bz2
11 years, 6 months
rpms/mess/F-18 dead.package, NONE, 1.1 .cvsignore, 1.10, NONE mess-fortify.patch, 1.1, NONE mess-verbosebuild.patch, 1.4, NONE mess.spec, 1.10, NONE sources, 1.10, NONE
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/mess/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv12442
Added Files:
dead.package
Removed Files:
.cvsignore mess-fortify.patch mess-verbosebuild.patch
mess.spec sources
Log Message:
As of 0.147, MESS has been merged with MAME.
--- NEW FILE dead.package ---
As of 0.147, MESS has been merged with MAME.
--- .cvsignore DELETED ---
--- mess-fortify.patch DELETED ---
--- mess-verbosebuild.patch DELETED ---
--- mess.spec DELETED ---
--- sources DELETED ---
11 years, 6 months
rpms/mame/F-16 .cvsignore, 1.64, 1.65 mame.spec, 1.72, 1.73 sources, 1.64, 1.65
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/mame/F-16
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv12321
Modified Files:
.cvsignore mame.spec sources
Log Message:
* Mon Oct 08 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.147u1-1
- Updated to 0.147u1
- Dropped missing whatsnew.txt workaround
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-16/.cvsignore,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- .cvsignore 22 Sep 2012 00:04:18 -0000 1.64
+++ .cvsignore 8 Oct 2012 17:44:04 -0000 1.65
@@ -1,2 +1,2 @@
mame0147s.exe
-whatsnew_0147.zip
+0147u1_diff.zip
Index: mame.spec
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-16/mame.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- mame.spec 22 Sep 2012 00:04:18 -0000 1.72
+++ mame.spec 8 Oct 2012 17:44:04 -0000 1.73
@@ -5,7 +5,7 @@
%bcond_with debug
%global baseversion 147
-%global sourceupdate 0
+%global sourceupdate 1
Name: mame
%if 0%{?sourceupdate}
@@ -20,11 +20,9 @@
License: MAME License
URL: http://mamedev.org/
Source0: http://mamedev.org/downloader.php?file=releases/%{name}0%{baseversion}s.exe
-#Get from http://mamedev.org/releases/whatsnew_0%{baseversion}.txt and compress
-Source100: whatsnew_0%{baseversion}.zip
%if 0%{?sourceupdate}
#Source updates
-#Source1: http://mamedev.org/updates/0%{baseversion}u1_diff.zip
+Source1: http://mamedev.org/updates/0%{baseversion}u1_diff.zip
#Source2: http://mamedev.org/updates/0%{baseversion}u2_diff.zip
#Source3: http://mamedev.org/updates/0%{baseversion}u3_diff.zip
#Source4: http://mamedev.org/updates/0%{baseversion}u4_diff.zip
@@ -131,10 +129,10 @@
%prep
%setup -qcT
-install -pm 644 %{SOURCE100} .
for sourcefile in %{sources}; do
7za x $sourcefile
done
+sed -i '2157d' src/mess/mess.mak
find . -type f -not -name *.png -exec sed -i 's/\r//' {} \;
%if 0%{?sourceupdate}
i=1
@@ -318,6 +316,7 @@
%endif
%files -n mess
+%doc messnew*.txt
%config(noreplace) %{_sysconfdir}/mess/mess.ini
%dir %{_sysconfdir}/mess
%{_sysconfdir}/skel/.mess
@@ -345,6 +344,10 @@
%changelog
+* Mon Oct 08 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.147u1-1
+- Updated to 0.147u1
+- Dropped missing whatsnew.txt workaround
+
* Fri Sep 21 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.147-1
- Updated to 0.147
- Merged with mess
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-16/sources,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- sources 22 Sep 2012 00:04:18 -0000 1.64
+++ sources 8 Oct 2012 17:44:04 -0000 1.65
@@ -1,2 +1,2 @@
02b38e27f0840bbd0b637385f16f3747 mame0147s.exe
-0b4bec8581c6cfaa3e0ac75d7d575fa9 whatsnew_0147.zip
+7f2dbea383138a6ae2bbaac3b32376d6 0147u1_diff.zip
11 years, 6 months
rpms/mame/F-17 .cvsignore, 1.64, 1.65 mame.spec, 1.73, 1.74 sources, 1.64, 1.65
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/mame/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv12244
Modified Files:
.cvsignore mame.spec sources
Log Message:
* Mon Oct 08 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.147u1-1
- Updated to 0.147u1
- Dropped missing whatsnew.txt workaround
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-17/.cvsignore,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- .cvsignore 22 Sep 2012 00:04:16 -0000 1.64
+++ .cvsignore 8 Oct 2012 17:44:00 -0000 1.65
@@ -1,2 +1,2 @@
mame0147s.exe
-whatsnew_0147.zip
+0147u1_diff.zip
Index: mame.spec
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-17/mame.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- mame.spec 22 Sep 2012 00:04:16 -0000 1.73
+++ mame.spec 8 Oct 2012 17:44:00 -0000 1.74
@@ -5,7 +5,7 @@
%bcond_with debug
%global baseversion 147
-%global sourceupdate 0
+%global sourceupdate 1
Name: mame
%if 0%{?sourceupdate}
@@ -20,11 +20,9 @@
License: MAME License
URL: http://mamedev.org/
Source0: http://mamedev.org/downloader.php?file=releases/%{name}0%{baseversion}s.exe
-#Get from http://mamedev.org/releases/whatsnew_0%{baseversion}.txt and compress
-Source100: whatsnew_0%{baseversion}.zip
%if 0%{?sourceupdate}
#Source updates
-#Source1: http://mamedev.org/updates/0%{baseversion}u1_diff.zip
+Source1: http://mamedev.org/updates/0%{baseversion}u1_diff.zip
#Source2: http://mamedev.org/updates/0%{baseversion}u2_diff.zip
#Source3: http://mamedev.org/updates/0%{baseversion}u3_diff.zip
#Source4: http://mamedev.org/updates/0%{baseversion}u4_diff.zip
@@ -131,10 +129,10 @@
%prep
%setup -qcT
-install -pm 644 %{SOURCE100} .
for sourcefile in %{sources}; do
7za x $sourcefile
done
+sed -i '2157d' src/mess/mess.mak
find . -type f -not -name *.png -exec sed -i 's/\r//' {} \;
%if 0%{?sourceupdate}
i=1
@@ -318,6 +316,7 @@
%endif
%files -n mess
+%doc messnew*.txt
%config(noreplace) %{_sysconfdir}/mess/mess.ini
%dir %{_sysconfdir}/mess
%{_sysconfdir}/skel/.mess
@@ -345,6 +344,10 @@
%changelog
+* Mon Oct 08 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.147u1-1
+- Updated to 0.147u1
+- Dropped missing whatsnew.txt workaround
+
* Fri Sep 21 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.147-1
- Updated to 0.147
- Merged with mess
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-17/sources,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- sources 22 Sep 2012 00:04:16 -0000 1.64
+++ sources 8 Oct 2012 17:44:00 -0000 1.65
@@ -1,2 +1,2 @@
02b38e27f0840bbd0b637385f16f3747 mame0147s.exe
-0b4bec8581c6cfaa3e0ac75d7d575fa9 whatsnew_0147.zip
+7f2dbea383138a6ae2bbaac3b32376d6 0147u1_diff.zip
11 years, 6 months
rpms/mame/F-18 .cvsignore, 1.62, 1.63 mame.spec, 1.71, 1.72 sources, 1.62, 1.63
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/mame/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv12167
Modified Files:
.cvsignore mame.spec sources
Log Message:
* Mon Oct 08 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.147u1-1
- Updated to 0.147u1
- Dropped missing whatsnew.txt workaround
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-18/.cvsignore,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- .cvsignore 30 Jul 2012 17:02:39 -0000 1.62
+++ .cvsignore 8 Oct 2012 17:43:56 -0000 1.63
@@ -1,5 +1,2 @@
-mame0146s.exe
-0146u1_diff.zip
-0146u2_diff.zip
-0146u3_diff.zip
-0146u4_diff.zip
+mame0147s.exe
+0147u1_diff.zip
Index: mame.spec
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-18/mame.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- mame.spec 30 Jul 2012 17:02:39 -0000 1.71
+++ mame.spec 8 Oct 2012 17:43:56 -0000 1.72
@@ -1,11 +1,11 @@
# ldplayer can be disabled by --without ldplayer or by changing to %bcond_with
# if it does not build. The debug build is disabled by default, please use
# --with debug to override
-%bcond_with ldplayer
+%bcond_without ldplayer
%bcond_with debug
-%global baseversion 146
-%global sourceupdate 4
+%global baseversion 147
+%global sourceupdate 1
Name: mame
%if 0%{?sourceupdate}
@@ -23,9 +23,9 @@
%if 0%{?sourceupdate}
#Source updates
Source1: http://mamedev.org/updates/0%{baseversion}u1_diff.zip
-Source2: http://mamedev.org/updates/0%{baseversion}u2_diff.zip
-Source3: http://mamedev.org/updates/0%{baseversion}u3_diff.zip
-Source4: http://mamedev.org/updates/0%{baseversion}u4_diff.zip
+#Source2: http://mamedev.org/updates/0%{baseversion}u2_diff.zip
+#Source3: http://mamedev.org/updates/0%{baseversion}u3_diff.zip
+#Source4: http://mamedev.org/updates/0%{baseversion}u4_diff.zip
#Source5: http://mamedev.org/updates/0%{baseversion}u5_diff.zip
#Source6: http://mamedev.org/updates/0%{baseversion}u6_diff.zip
#Source7: http://mamedev.org/updates/0%{baseversion}u7_diff.zip
@@ -43,11 +43,10 @@
BuildRequires: p7zip
BuildRequires: SDL_ttf-devel
BuildRequires: zlib-devel
+Requires: %{name}-data = %{version}-%{release}
-Provides: sdlmame = 0%{baseversion}-%{release}
Provides: bundled(libjpeg) = 8c
Provides: bundled(lzma-sdk) = 9.22
-Obsoletes: sdlmame < 0136-2
%description
MAME stands for Multiple Arcade Machine Emulator. When used in conjunction
@@ -68,34 +67,72 @@
emulating the games faithfully.
%package tools
-Summary: Tools used for the MAME package
-Group: Applications/Emulators
+Summary: Additional tools for MAME
Requires: %{name} = %{version}-%{release}
-Provides: sdlmame-tools = 0%{baseversion}-%{release}
-Obsoletes: sdlmame-tools < 0136-2
-
%description tools
%{summary}.
%if %{with ldplayer}
%package ldplayer
Summary: Standalone laserdisc player based on MAME
-Group: Applications/Emulators
-
-Provides: sdlmame-ldplayer = 0%{baseversion}-%{release}
-Obsoletes: sdlmame-ldplayer < 0136-2
%description ldplayer
%{summary}.
%endif
+%package -n mess
+Summary: Multi Emulator Super System
+Requires: mess-data = %{version}-%{release}
+
+Provides: bundled(libjpeg) = 8c
+Provides: bundled(lzma-sdk) = 9.22
+
+%description -n mess
+MESS is an acronym that stands for Multi Emulator Super System. MESS will
+more or less faithfully reproduce computer and console systems on a PC.
+
+MESS emulates the hardware of the systems and sometimes utilizes ROM images to
+load programs and games. Therefore, these systems are NOT simulations, but
+the actual emulations of the hardware.
+
+%package -n mess-tools
+Summary: Additional tools for MESS
+Requires: mess = %{version}-%{release}
+
+%description -n mess-tools
+%{summary}.
+
+%package data
+Summary: Data files used by both MAME and MESS
+
+Provides: mess-data = %{version}-%{release}
+
+BuildArch: noarch
+
+%description data
+%{summary}.
+
+%package data-software-lists
+Summary: Software lists used by both MAME and MESS
+Requires: %{name}-data = %{version}-%{release}
+
+Provides: mess-data-software-lists = %{version}-%{release}
+Obsoletes: mess-data < 0.146-2
+
+BuildArch: noarch
+
+%description data-software-lists
+%{summary}. These are split from the main -data subpackage due to relatively
+large size.
+
%prep
%setup -qcT
for sourcefile in %{sources}; do
7za x $sourcefile
done
+sed -i '2157d' src/mess/mess.mak
find . -type f -not -name *.png -exec sed -i 's/\r//' {} \;
%if 0%{?sourceupdate}
i=1
@@ -108,7 +145,7 @@
%patch2 -p1 -b .verbosebuild
-# Create ini file
+# Create ini files
cat > %{name}.ini << EOF
# Define multi-user paths
artpath %{_datadir}/%{name}/artwork;%{_datadir}/%{name}/effects
@@ -137,24 +174,35 @@
autosave 1
EOF
+#make a copy for MESS
+cp %{name}.ini mess.ini
+sed -i 's/%{name}/mess/' mess.ini
+
%build
#these flags are already included in the Makefile
RPM_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | sed -e s/"-O2 -g -pipe -Wall "//)
+#save some space
+MAME_FLAGS="NOWERROR=1 SYMBOLS=1 OPTIMIZE=2 BUILD_EXPAT=0 BUILD_ZLIB=0 \
+ BUILD_JPEG=1 BUILD_FLAC=0 SUFFIX64="
+
%if %{with ldplayer}
-make %{?_smp_mflags} NOWERROR=1 SYMBOLS=1 OPTIMIZE=2 BUILD_EXPAT=0 BUILD_ZLIB=0 \
- BUILD_JPEG=1 BUILD_FLAC=0 SUFFIX64="" TARGET=ldplayer \
+make %{?_smp_mflags} $MAME_FLAGS TARGET=ldplayer \
OPT_FLAGS="$RPM_OPT_FLAGS -DINI_PATH='\"%{_sysconfdir}/%{name};\"'"
%endif
%if %{with debug}
-make %{?_smp_mflags} NOWERROR=1 SYMBOLS=1 OPTIMIZE=2 BUILD_EXPAT=0 BUILD_ZLIB=0 \
- BUILD_JPEG=1 BUILD_FLAC=0 SUFFIX64="" DEBUG=1 \
+make %{?_smp_mflags} $MAME_FLAGS DEBUG=1 \
OPT_FLAGS="$RPM_OPT_FLAGS -DINI_PATH='\"%{_sysconfdir}/%{name};\"'" all
+
+make %{?_smp_mflags} $MAME_FLAGS DEBUG=1 TARGET=mess \
+ OPT_FLAGS="$RPM_OPT_FLAGS -DINI_PATH='\"%{_sysconfdir}/mess;\"'" all
%else
-make %{?_smp_mflags} NOWERROR=1 SYMBOLS=1 OPTIMIZE=2 BUILD_EXPAT=0 BUILD_ZLIB=0 \
- BUILD_JPEG=1 BUILD_FLAC=0 SUFFIX64="" \
+make %{?_smp_mflags} $MAME_FLAGS \
OPT_FLAGS="$RPM_OPT_FLAGS -DINI_PATH='\"%{_sysconfdir}/%{name};\"'" all
+
+make %{?_smp_mflags} $MAME_FLAGS TARGET=mess\
+ OPT_FLAGS="$RPM_OPT_FLAGS -DINI_PATH='\"%{_sysconfdir}/mess;\"'" all
%endif
@@ -163,63 +211,75 @@
# create directories
install -d $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/skel/.%{name}/cfg
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/skel/.%{name}/comments
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/skel/.%{name}/diff
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/skel/.%{name}/ini
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/skel/.%{name}/inp
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/skel/.%{name}/memcard
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/skel/.%{name}/nvram
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/skel/.%{name}/snap
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/skel/.%{name}/sta
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/mess
+for folder in cfg comments diff ini inp memcard nvram snap sta
+do
+ install -d $RPM_BUILD_ROOT%{_sysconfdir}/skel/.%{name}/$folder
+ install -d $RPM_BUILD_ROOT%{_sysconfdir}/skel/.mess/$folder
+done
install -d $RPM_BUILD_ROOT%{_bindir}
-install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/artwork
-install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/chds
-install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/cheats
-install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/ctrlr
-install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/effects
-install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/fonts
-install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/hash
-install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/hlsl
-install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/keymaps
-install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/roms
-install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/samples
-install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/shader
+for folder in artwork chds cheats ctrlr effects fonts hash hlsl keymaps roms \
+ samples shader
+do
+ install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/$folder
+done
+for folder in artwork chds cheats ctrlr effects fonts hash hlsl keymaps roms \
+ samples shader software
+do
+ install -d $RPM_BUILD_ROOT%{_datadir}/mess/$folder
+done
install -d $RPM_BUILD_ROOT%{_mandir}/man1
+install -d $RPM_BUILD_ROOT%{_mandir}/man6
# install files
install -pm 644 %{name}.ini $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
+install -pm 644 mess.ini $RPM_BUILD_ROOT%{_sysconfdir}/mess
%if %{with ldplayer}
install -pm 755 ldplayer $RPM_BUILD_ROOT%{_bindir}
%endif
%if %{with debug}
install -pm 755 %{name}d $RPM_BUILD_ROOT%{_bindir}
+install -pm 755 messd $RPM_BUILD_ROOT%{_bindir}
%else
install -pm 755 %{name} $RPM_BUILD_ROOT%{_bindir}
+install -pm 755 mess $RPM_BUILD_ROOT%{_bindir}
%endif
-install -pm 755 chdman jedutil ldresample ldverify \
- romcmp testkeys unidasm $RPM_BUILD_ROOT%{_bindir}
+install -pm 755 chdman jedutil ldresample ldverify romcmp testkeys unidasm \
+ castool floptool imgtool $RPM_BUILD_ROOT%{_bindir}
#for tool in regrep runtest split src2html srcclean
for tool in regrep split src2html srcclean
do
-install -pm 755 $tool $RPM_BUILD_ROOT%{_bindir}/%{name}-$tool
+ install -pm 755 $tool $RPM_BUILD_ROOT%{_bindir}/%{name}-$tool
done
install -pm 644 artwork/* $RPM_BUILD_ROOT%{_datadir}/%{name}/artwork
install -pm 644 hash/* $RPM_BUILD_ROOT%{_datadir}/%{name}/hash
install -pm 644 hlsl/* $RPM_BUILD_ROOT%{_datadir}/%{name}/hlsl
-install -pm 644 src/osd/sdl/keymaps/* $RPM_BUILD_ROOT%{_datadir}/%{name}/keymaps
-install -pm 644 src/osd/sdl/shader/*.?sh $RPM_BUILD_ROOT%{_datadir}/%{name}/shader
-pushd src/osd/sdl/man
+install -pm 644 keymaps/* $RPM_BUILD_ROOT%{_datadir}/%{name}/keymaps
+pushd src/osd/sdl
+install -pm 644 shader/*.?sh $RPM_BUILD_ROOT%{_datadir}/%{name}/shader
+for folder in artwork hash hlsl keymaps shader
+do
+ pushd $RPM_BUILD_ROOT%{_datadir}/%{name}/$folder
+ for i in *
+ do
+ ln -s ../../%{name}/$folder/$i ../../mess/$folder/$i
+ done
+ popd
+done
+pushd man
%if %{with ldplayer}
install -pm 644 ldplayer.1 $RPM_BUILD_ROOT%{_mandir}/man1
%endif
-install -pm 644 chdman.1 jedutil.1 ldverify.1 mame.6 romcmp.1 \
- testkeys.1 $RPM_BUILD_ROOT%{_mandir}/man1
+install -pm 644 chdman.1 jedutil.1 ldverify.1 romcmp.1 testkeys.1 \
+ $RPM_BUILD_ROOT%{_mandir}/man1
+install -pm 644 mame.6 $RPM_BUILD_ROOT%{_mandir}/man6
+popd
popd
%files
-%doc docs/* whatsnew*.txt
+%doc docs/config.txt docs/hlsl.txt docs/license.txt docs/mame.txt
+%doc docs/newvideo.txt docs/nscsi.txt whatsnew*.txt
%config(noreplace) %{_sysconfdir}/%{name}/%{name}.ini
%dir %{_sysconfdir}/%{name}
%{_sysconfdir}/skel/.%{name}
@@ -228,8 +288,7 @@
%else
%{_bindir}/%{name}
%endif
-%{_datadir}/%{name}
-%{_mandir}/man1/mame.6*
+%{_mandir}/man6/mame.6*
%files tools
%{_bindir}/chdman
@@ -256,8 +315,51 @@
%{_mandir}/man1/ldplayer.1*
%endif
+%files -n mess
+%doc messnew*.txt
+%config(noreplace) %{_sysconfdir}/mess/mess.ini
+%dir %{_sysconfdir}/mess
+%{_sysconfdir}/skel/.mess
+%if %{with debug}
+%{_bindir}/messd
+%else
+%{_bindir}/mess
+%endif
+
+%files -n mess-tools
+%doc docs/imgtool.txt
+%{_bindir}/castool
+%{_bindir}/floptool
+%{_bindir}/imgtool
+
+%files data
+%{_datadir}/%{name}
+%exclude %{_datadir}/%{name}/hash/*
+%{_datadir}/mess
+%exclude %{_datadir}/mess/hash/*
+
+%files data-software-lists
+%{_datadir}/%{name}/hash/*
+%{_datadir}/mess/hash/*
+
%changelog
+* Mon Oct 08 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.147u1-1
+- Updated to 0.147u1
+- Dropped missing whatsnew.txt workaround
+
+* Fri Sep 21 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.147-1
+- Updated to 0.147
+- Merged with mess
+- Streamlined the directories installation
+- Worked around missing whatsnew.txt
+- Fixed mame.6 installation location
+- Re-enabled ldplayer
+- Cleaned-up ancient Obsoletes/Provides
+
+* Mon Aug 20 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.146u5-1
+- Updated to 0.146u5
+
* Mon Jul 30 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.146u4-1
- Updated to 0.146u4
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-18/sources,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- sources 30 Jul 2012 17:02:39 -0000 1.62
+++ sources 8 Oct 2012 17:43:56 -0000 1.63
@@ -1,5 +1,2 @@
-22c6aa9472f1c6118f1645171afe667c mame0146s.exe
-9a3eecc61c104539c01499834f4cfa27 0146u1_diff.zip
-0ef1c3d8b7798d0be186d802b8610c27 0146u2_diff.zip
-0b7633e0e70a0c94c12d2c3d06930f6a 0146u3_diff.zip
-a9f6a9c8df0139a55bce9ae50d4f9435 0146u4_diff.zip
+02b38e27f0840bbd0b637385f16f3747 mame0147s.exe
+7f2dbea383138a6ae2bbaac3b32376d6 0147u1_diff.zip
11 years, 6 months
rpms/mame/devel .cvsignore, 1.64, 1.65 mame.spec, 1.73, 1.74 sources, 1.64, 1.65
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/mame/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv12081
Modified Files:
.cvsignore mame.spec sources
Log Message:
* Mon Oct 08 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.147u1-1
- Updated to 0.147u1
- Dropped missing whatsnew.txt workaround
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/mame/devel/.cvsignore,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- .cvsignore 22 Sep 2012 00:04:10 -0000 1.64
+++ .cvsignore 8 Oct 2012 17:43:51 -0000 1.65
@@ -1,2 +1,2 @@
mame0147s.exe
-whatsnew_0147.zip
+0147u1_diff.zip
Index: mame.spec
===================================================================
RCS file: /cvs/nonfree/rpms/mame/devel/mame.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- mame.spec 22 Sep 2012 00:04:10 -0000 1.73
+++ mame.spec 8 Oct 2012 17:43:51 -0000 1.74
@@ -5,7 +5,7 @@
%bcond_with debug
%global baseversion 147
-%global sourceupdate 0
+%global sourceupdate 1
Name: mame
%if 0%{?sourceupdate}
@@ -20,11 +20,9 @@
License: MAME License
URL: http://mamedev.org/
Source0: http://mamedev.org/downloader.php?file=releases/%{name}0%{baseversion}s.exe
-#Get from http://mamedev.org/releases/whatsnew_0%{baseversion}.txt and compress
-Source100: whatsnew_0%{baseversion}.zip
%if 0%{?sourceupdate}
#Source updates
-#Source1: http://mamedev.org/updates/0%{baseversion}u1_diff.zip
+Source1: http://mamedev.org/updates/0%{baseversion}u1_diff.zip
#Source2: http://mamedev.org/updates/0%{baseversion}u2_diff.zip
#Source3: http://mamedev.org/updates/0%{baseversion}u3_diff.zip
#Source4: http://mamedev.org/updates/0%{baseversion}u4_diff.zip
@@ -131,10 +129,10 @@
%prep
%setup -qcT
-install -pm 644 %{SOURCE100} .
for sourcefile in %{sources}; do
7za x $sourcefile
done
+sed -i '2157d' src/mess/mess.mak
find . -type f -not -name *.png -exec sed -i 's/\r//' {} \;
%if 0%{?sourceupdate}
i=1
@@ -318,6 +316,7 @@
%endif
%files -n mess
+%doc messnew*.txt
%config(noreplace) %{_sysconfdir}/mess/mess.ini
%dir %{_sysconfdir}/mess
%{_sysconfdir}/skel/.mess
@@ -345,6 +344,10 @@
%changelog
+* Mon Oct 08 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.147u1-1
+- Updated to 0.147u1
+- Dropped missing whatsnew.txt workaround
+
* Fri Sep 21 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.147-1
- Updated to 0.147
- Merged with mess
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/mame/devel/sources,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- sources 22 Sep 2012 00:04:10 -0000 1.64
+++ sources 8 Oct 2012 17:43:51 -0000 1.65
@@ -1,2 +1,2 @@
02b38e27f0840bbd0b637385f16f3747 mame0147s.exe
-0b4bec8581c6cfaa3e0ac75d7d575fa9 whatsnew_0147.zip
+7f2dbea383138a6ae2bbaac3b32376d6 0147u1_diff.zip
11 years, 6 months
rpms/ffmpeg/EL-6 ffmpeg-0.10.4-backport-libv4l2.patch,1.2,1.3
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/ffmpeg/EL-6
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv8016/EL-6
Added Files:
ffmpeg-0.10.4-backport-libv4l2.patch
Log Message:
Recover the missing patch
ffmpeg-0.10.4-backport-libv4l2.patch:
v4l2.c | 13 -------------
1 file changed, 13 deletions(-)
Index: ffmpeg-0.10.4-backport-libv4l2.patch
===================================================================
RCS file: ffmpeg-0.10.4-backport-libv4l2.patch
diff -N ffmpeg-0.10.4-backport-libv4l2.patch
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ ffmpeg-0.10.4-backport-libv4l2.patch 7 Oct 2012 16:39:23 -0000 1.3
@@ -0,0 +1,33 @@
+X-Git-Url: http://git.videolan.org/?p=ffmpeg.git;a=blobdiff_plain;f=libavdevice%2Fv4...
+
+diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c
+index 4829b1b..2808e13 100644
+--- a/libavdevice/v4l2.c
++++ b/libavdevice/v4l2.c
+@@ -156,9 +156,6 @@ static int device_open(AVFormatContext *ctx)
+ {
+ struct v4l2_capability cap;
+ int fd;
+-#if CONFIG_LIBV4L2
+- int fd_libv4l;
+-#endif
+ int res, err;
+ int flags = O_RDWR;
+
+@@ -175,16 +172,6 @@ static int device_open(AVFormatContext *ctx)
+
+ return AVERROR(err);
+ }
+-#if CONFIG_LIBV4L2
+- fd_libv4l = v4l2_fd_open(fd, 0);
+- if (fd < 0) {
+- err = AVERROR(errno);
+- av_log(ctx, AV_LOG_ERROR, "Cannot open video device with libv4l neither %s : %s\n",
+- ctx->filename, strerror(errno));
+- return err;
+- }
+- fd = fd_libv4l;
+-#endif
+
+ res = v4l2_ioctl(fd, VIDIOC_QUERYCAP, &cap);
+ if (res < 0) {
11 years, 6 months
rpms/ffmpeg/EL-6 .cvsignore, 1.26, 1.27 ffmpeg.spec, 1.47, 1.48 sources, 1.26, 1.27 ffmpeg-0.10.4-backport-libv4l2.patch, 1.1, NONE
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/ffmpeg/EL-6
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv7597/EL-6
Modified Files:
.cvsignore ffmpeg.spec sources
Removed Files:
ffmpeg-0.10.4-backport-libv4l2.patch
Log Message:
Update to 0.10.5
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/EL-6/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore 2 Jul 2012 13:10:20 -0000 1.26
+++ .cvsignore 7 Oct 2012 16:32:39 -0000 1.27
@@ -1 +1 @@
-ffmpeg-0.10.4.tar.bz2
+ffmpeg-0.10.5.tar.bz2
Index: ffmpeg.spec
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/EL-6/ffmpeg.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- ffmpeg.spec 21 Jul 2012 08:29:13 -0000 1.47
+++ ffmpeg.spec 7 Oct 2012 16:32:39 -0000 1.48
@@ -11,8 +11,8 @@
Summary: Digital VCR and streaming server
Name: ffmpeg
-Version: 0.10.4
-Release: 2%{?date}%{?date:git}%{?rel}%{?dist}
+Version: 0.10.5
+Release: 1%{?date}%{?date:git}%{?rel}%{?dist}
%if 0%{?_with_amr:1}
License: GPLv3+
%else
@@ -280,6 +280,9 @@
%changelog
+* Thu Oct 04 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.10.5-1
+- Updated to 0.10.5
+
* Fri Jul 20 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.10.4-2
- Backport fix rfbz#2423
Index: sources
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/EL-6/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources 2 Jul 2012 13:10:20 -0000 1.26
+++ sources 7 Oct 2012 16:32:39 -0000 1.27
@@ -1 +1 @@
-25740dd23f6d65439f908ec212da10d7 ffmpeg-0.10.4.tar.bz2
+f1384d0312f95d6294e017fc38318521 ffmpeg-0.10.5.tar.bz2
--- ffmpeg-0.10.4-backport-libv4l2.patch DELETED ---
11 years, 6 months