rpms/mame/F-17 .cvsignore, 1.74, 1.75 mame.spec, 1.83, 1.84 sources, 1.74, 1.75
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/mame/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv11429
Modified Files:
.cvsignore mame.spec sources
Log Message:
* Tue Jun 11 2013 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.149-1
- Updated to 0.149
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-17/.cvsignore,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- .cvsignore 20 May 2013 17:26:17 -0000 1.74
+++ .cvsignore 11 Jun 2013 19:03:20 -0000 1.75
@@ -1,6 +1 @@
-mame0148s.exe
-0148u1_diff.zip
-0148u2_diff.zip
-0148u3_diff.zip
-0148u4_diff.zip
-0148u5_diff.zip
+mame0149s.exe
Index: mame.spec
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-17/mame.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- mame.spec 20 May 2013 17:26:17 -0000 1.83
+++ mame.spec 11 Jun 2013 19:03:20 -0000 1.84
@@ -4,8 +4,8 @@
%bcond_without ldplayer
%bcond_with debug
-%global baseversion 148
-%global sourceupdate 5
+%global baseversion 149
+#global sourceupdate 5
#global svn 21418
%if 0%{?svn}
@@ -38,11 +38,11 @@
#Source100: whatsnew.zip
%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
-Source5: http://mamedev.org/updates/0%{baseversion}u5_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
+#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
#Source8: http://mamedev.org/updates/0%{baseversion}u8_diff.zip
@@ -383,6 +383,9 @@
%changelog
+* Tue Jun 11 2013 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.149-1
+- Updated to 0.149
+
* Mon May 20 2013 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.148u5-1
- Updated to 0.148u5
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-17/sources,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- sources 20 May 2013 17:26:17 -0000 1.74
+++ sources 11 Jun 2013 19:03:20 -0000 1.75
@@ -1,6 +1 @@
-fec467ec70d727d3dd1c31e3fb687275 mame0148s.exe
-01edd53824784f52448f4128f6d52aac 0148u1_diff.zip
-6970189e5cd593dea59aa87579bb4dca 0148u2_diff.zip
-406dff01777ba08a35489b3081d5f644 0148u3_diff.zip
-b25fa2cc9a6e5b527149553a11125944 0148u4_diff.zip
-1a252940b011a5bb41ee1292522c817d 0148u5_diff.zip
+2b0e49d93a9d21c9938c57f35fa3bab5 mame0149s.exe
10 years, 10 months
rpms/mame/F-18 .cvsignore, 1.73, 1.74 mame.spec, 1.83, 1.84 sources, 1.73, 1.74
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/mame/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv11398
Modified Files:
.cvsignore mame.spec sources
Log Message:
* Tue Jun 11 2013 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.149-1
- Updated to 0.149
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-18/.cvsignore,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- .cvsignore 20 May 2013 17:26:14 -0000 1.73
+++ .cvsignore 11 Jun 2013 19:03:18 -0000 1.74
@@ -1,6 +1 @@
-mame0148s.exe
-0148u1_diff.zip
-0148u2_diff.zip
-0148u3_diff.zip
-0148u4_diff.zip
-0148u5_diff.zip
+mame0149s.exe
Index: mame.spec
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-18/mame.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- mame.spec 20 May 2013 17:26:14 -0000 1.83
+++ mame.spec 11 Jun 2013 19:03:18 -0000 1.84
@@ -4,8 +4,8 @@
%bcond_without ldplayer
%bcond_with debug
-%global baseversion 148
-%global sourceupdate 5
+%global baseversion 149
+#global sourceupdate 5
#global svn 21418
%if 0%{?svn}
@@ -38,11 +38,11 @@
#Source100: whatsnew.zip
%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
-Source5: http://mamedev.org/updates/0%{baseversion}u5_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
+#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
#Source8: http://mamedev.org/updates/0%{baseversion}u8_diff.zip
@@ -383,6 +383,9 @@
%changelog
+* Tue Jun 11 2013 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.149-1
+- Updated to 0.149
+
* Mon May 20 2013 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.148u5-1
- Updated to 0.148u5
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-18/sources,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- sources 20 May 2013 17:26:14 -0000 1.73
+++ sources 11 Jun 2013 19:03:18 -0000 1.74
@@ -1,6 +1 @@
-fec467ec70d727d3dd1c31e3fb687275 mame0148s.exe
-01edd53824784f52448f4128f6d52aac 0148u1_diff.zip
-6970189e5cd593dea59aa87579bb4dca 0148u2_diff.zip
-406dff01777ba08a35489b3081d5f644 0148u3_diff.zip
-b25fa2cc9a6e5b527149553a11125944 0148u4_diff.zip
-1a252940b011a5bb41ee1292522c817d 0148u5_diff.zip
+2b0e49d93a9d21c9938c57f35fa3bab5 mame0149s.exe
10 years, 10 months
rpms/mame/devel .cvsignore, 1.74, 1.75 mame.spec, 1.85, 1.86 sources, 1.74, 1.75
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/mame/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv11335
Modified Files:
.cvsignore mame.spec sources
Log Message:
* Tue Jun 11 2013 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.149-1
- Updated to 0.149
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/mame/devel/.cvsignore,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- .cvsignore 20 May 2013 17:26:11 -0000 1.74
+++ .cvsignore 11 Jun 2013 19:03:15 -0000 1.75
@@ -1,6 +1 @@
-mame0148s.exe
-0148u1_diff.zip
-0148u2_diff.zip
-0148u3_diff.zip
-0148u4_diff.zip
-0148u5_diff.zip
+mame0149s.exe
Index: mame.spec
===================================================================
RCS file: /cvs/nonfree/rpms/mame/devel/mame.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- mame.spec 20 May 2013 17:26:11 -0000 1.85
+++ mame.spec 11 Jun 2013 19:03:15 -0000 1.86
@@ -4,8 +4,8 @@
%bcond_without ldplayer
%bcond_with debug
-%global baseversion 148
-%global sourceupdate 5
+%global baseversion 149
+#global sourceupdate 5
#global svn 21418
%if 0%{?svn}
@@ -38,11 +38,11 @@
#Source100: whatsnew.zip
%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
-Source5: http://mamedev.org/updates/0%{baseversion}u5_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
+#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
#Source8: http://mamedev.org/updates/0%{baseversion}u8_diff.zip
@@ -383,6 +383,9 @@
%changelog
+* Tue Jun 11 2013 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.149-1
+- Updated to 0.149
+
* Mon May 20 2013 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.148u5-1
- Updated to 0.148u5
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/mame/devel/sources,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- sources 20 May 2013 17:26:11 -0000 1.74
+++ sources 11 Jun 2013 19:03:15 -0000 1.75
@@ -1,6 +1 @@
-fec467ec70d727d3dd1c31e3fb687275 mame0148s.exe
-01edd53824784f52448f4128f6d52aac 0148u1_diff.zip
-6970189e5cd593dea59aa87579bb4dca 0148u2_diff.zip
-406dff01777ba08a35489b3081d5f644 0148u3_diff.zip
-b25fa2cc9a6e5b527149553a11125944 0148u4_diff.zip
-1a252940b011a5bb41ee1292522c817d 0148u5_diff.zip
+2b0e49d93a9d21c9938c57f35fa3bab5 mame0149s.exe
10 years, 10 months
rpms/vdr-burn/F-18 vdr-burn-0.2.2-config.patch, 1.1, 1.2 vdr-burn.spec, 1.14, 1.15 vdr-burn-0.2.2-Makefile.patch, 1.1, NONE
by Martin Gansser
Author: martinkg
Update of /cvs/free/rpms/vdr-burn/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv9056/F-18
Modified Files:
vdr-burn-0.2.2-config.patch vdr-burn.spec
Removed Files:
vdr-burn-0.2.2-Makefile.patch
Log Message:
vdr-burn-0.2.2-config.patch:
Makefile | 4 ++--
README | 4 ++--
burn/vdrburn-dvd.conf | 2 +-
chain-archive.c | 2 +-
jobs.c | 2 +-
vdrburn-archive.sh | 6 +++---
vdrburn-dvd.sh | 11 ++++++-----
7 files changed, 16 insertions(+), 15 deletions(-)
Index: vdr-burn-0.2.2-config.patch
===================================================================
RCS file: /cvs/free/rpms/vdr-burn/F-18/vdr-burn-0.2.2-config.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vdr-burn-0.2.2-config.patch 23 Feb 2013 14:34:10 -0000 1.1
+++ vdr-burn-0.2.2-config.patch 11 Jun 2013 17:09:44 -0000 1.2
@@ -1,24 +1,17 @@
-Index: README
-===================================================================
---- README.orig 2012-10-07 17:31:04.771395847 +0200
-+++ README 2012-10-07 17:31:55.124400166 +0200
-@@ -77,7 +77,7 @@
-
- 3b.(optional) Change the default temporary folder, the default DVD writer device
- and the default ISO directory with TMPDIR (default: /tmp),
-- DVDDEV (default: /dev/dvdrw) and ISODIR (default: /pub/export)
-+ DVDDEV (default: /dev/dvdrw) and ISODIR (default: video dir)
-
- # make DVDDEV=/dev/cdrecorder ISODIR=/export plugins
-
-Index: chain-archive.c
-===================================================================
-RCS file: /var/cvsroot/burn/chain-archive.c,v
-retrieving revision 1.13
-diff -u -r1.13 chain-archive.c
---- chain-archive.c 16 Sep 2006 18:33:36 -0000 1.13
-+++ chain-archive.c 12 Dec 2006 20:31:14 -0000
-@@ -64,7 +64,7 @@
+diff -up burn-0.2.2/burn/vdrburn-dvd.conf~ burn-0.2.2/burn/vdrburn-dvd.conf
+--- burn-0.2.2/burn/vdrburn-dvd.conf~ 2011-10-08 15:28:55.000000000 +0300
++++ burn-0.2.2/burn/vdrburn-dvd.conf 2013-02-24 23:51:46.936031051 +0200
+@@ -1,5 +1,5 @@
+ # settings for vdrburn-dvd.sh
+
+ # Java and Project X
+-#export JAVA_EXE=/usr/bin/java
++export JAVA_EXE=/usr/bin/java
+ export PROJECTX_JAR=/usr/share/java/ProjectX.jar
+diff -up burn-0.2.2/chain-archive.c~ burn-0.2.2/chain-archive.c
+--- burn-0.2.2/chain-archive.c~ 2006-09-16 21:33:36.000000000 +0300
++++ burn-0.2.2/chain-archive.c 2013-02-24 23:51:46.936031051 +0200
+@@ -64,7 +64,7 @@ namespace vdr_burn
bind( &recording::get_graft_point, _2 ),
" "
)));
@@ -27,14 +20,10 @@
switch (get_job().get_store_mode()) {
case storemode_create:
-Index: jobs.c
-===================================================================
-RCS file: /var/cvsroot/burn/jobs.c,v
-retrieving revision 1.35
-diff -u -r1.35 jobs.c
---- jobs.c 1 Oct 2006 21:22:27 -0000 1.35
-+++ jobs.c 12 Dec 2006 20:31:14 -0000
-@@ -389,7 +389,7 @@
+diff -up burn-0.2.2/jobs.c~ burn-0.2.2/jobs.c
+--- burn-0.2.2/jobs.c~ 2011-10-04 19:25:45.000000000 +0300
++++ burn-0.2.2/jobs.c 2013-02-24 23:51:46.936031051 +0200
+@@ -436,7 +436,7 @@ namespace vdr_burn
std::string job::get_archive_id()
{
std::string archive_id = "";
@@ -43,58 +32,80 @@
std::ifstream f(counter_path.c_str());
if (!f) {
proctools::logger::error(proctools::format("couldn't read {0}") % counter_path);
-Index: vdrburn-archive.sh
-===================================================================
---- vdrburn-archive.sh.orig 2012-10-07 17:35:46.210420545 +0200
-+++ vdrburn-archive.sh 2012-10-07 17:38:38.421435235 +0200
-@@ -53,7 +53,7 @@
+diff -up burn-0.2.2/Makefile~ burn-0.2.2/Makefile
+--- burn-0.2.2/Makefile~ 2013-02-21 12:04:10.000000000 +0200
++++ burn-0.2.2/Makefile 2013-02-24 23:51:13.517432291 +0200
+@@ -126,7 +126,7 @@ TMPDIR=/tmp
+ endif
+
+ ifndef DVDDEV
+-DVDDEV=/dev/dvdrw
++DVDDEV=/dev/cdrom
+ endif
+
+ ifndef ISODIR
+@@ -134,7 +134,7 @@
+ endif
+
+ ### compile only with ttxtsub support if core VDR is patched
+-ifneq ($(strip $(wildcard $(VDRDIR)/vdrttxtsubshooks.h)),)
++ifneq ($(strip $(wildcard /usr/include/vdr/vdrttxtsubshooks.h)),)
+ DEFINES += -DTTXT_SUBTITLES
+ endif
+
+diff -up burn-0.2.2/README~ burn-0.2.2/README
+--- burn-0.2.2/README~ 2011-12-28 18:18:15.000000000 +0200
++++ burn-0.2.2/README 2013-02-24 23:51:46.937031069 +0200
+@@ -77,7 +77,7 @@ Installation
+
+ 3b.(optional) Change the default temporary folder, the default DVD writer device
+ and the default ISO directory with TMPDIR (default: /tmp),
+- DVDDEV (default: /dev/dvdrw) and ISODIR (default: /pub/export)
++ DVDDEV (default: /dev/cdrom) and ISODIR (default: video dir)
+
+ # make DVDDEV=/dev/cdrecorder ISODIR=/export plugins
+
+@@ -119,7 +119,7 @@ The plugin accepts the following paramet
+ -d DIR, --datadir=DIR use DIR for temporary datafiles
+ (default: /var/spool/video)
+ -D DEV --dvd=DEV use DEV as DVD Writer
+- (default: /dev/dvdrw)
++ (default: /dev/cdrom)
+ -i DIR --iso=DIR use DIR to store ISO images
+ (default: /pub/export)
+
+diff -up burn-0.2.2/vdrburn-archive.sh~ burn-0.2.2/vdrburn-archive.sh
+--- burn-0.2.2/vdrburn-archive.sh~ 2011-10-10 21:59:47.000000000 +0300
++++ burn-0.2.2/vdrburn-archive.sh 2013-02-24 23:51:46.937031069 +0200
+@@ -53,7 +53,7 @@ case $1 in
RECORDING_DMH="$RECPATH"/"$UPPERRECDIR"_DVD/"$RECDIR"
mkdir -p "$RECORDING_DMH"
- cp "$CONFIG_PATH/counters/standard" "$RECORDING_DMH"/dvd.vdr
-+ cp "/var/lib/vdr/burn/counters/standard" "$RECORDING_DMH/dvd.vdr"
++ cp "/var/lib/vdr/burn/counters/standard" "$RECORDING_DMH"/dvd.vdr
# Old style Records ("index.vdr"/"info.vdr")
if [ -f "$RECORDING_PATH"/index.vdr ]; then
cp "$RECORDING_PATH"/info.vdr "$RECORDING_DMH"/info.vdr
-@@ -66,8 +66,8 @@
+@@ -66,8 +66,8 @@ case $1 in
;;
archivemark)
- ((DVD_ID = `cat $CONFIG_PATH/counters/standard | sed "s/^0*//"` + 1))
- printf "%04d\n" $DVD_ID > "$CONFIG_PATH/counters/standard"
-+ (DVD_ID = `cat /var/lib/vdr/burn/counters/standard | sed "s/^0*//"` + 1))
++ ((DVD_ID = `cat /var/lib/vdr/burn/counters/standard | sed "s/^0*//"` + 1))
+ printf "%04d\n" $DVD_ID > "/var/lib/vdr/burn/counters/standard"
;;
*)
-Index: vdrburn-dvd.sh
-===================================================================
---- vdrburn-dvd.sh.orig 2012-10-07 17:40:01.859441567 +0200
-+++ vdrburn-dvd.sh 2012-10-07 17:48:54.861488725 +0200
-@@ -78,7 +78,7 @@
- ;;
-
- demux)
-- [ -r $CONFIG_PATH/vdrburn-dvd.conf ] && . $CONFIG_PATH/vdrburn-dvd.conf
-+ [ -r /etc/vdr/plugins/burn/vdrburn-dvd.conf ] && . /etc/vdr/plugins/burn/vdrburn-dvd.conf
- [ -z "$JAVA_EXE" ] && JAVA_EXE=$(which java)
-
- [ ! -x "$JAVA_EXE" ] && echo "ERROR: java executable \"$JAVA_EXE\" not found" && exit 1
-@@ -94,7 +94,7 @@
-
- $IO_NICE $JAVA_EXE -Djava.awt.headless=true \
- -jar $PROJECTX_JAR \
-- -ini $CONFIG_PATH/ProjectX.ini \
-+ -ini /etc/vdr/plugins/burn/ProjectX.ini \
- $TTXT_OPTS \
- $CUT -id $USED_TRACKS \
- -demux -out "$MPEG_DATA_PATH" -name vdrsync \
-@@ -245,15 +245,16 @@
+diff -up burn-0.2.2/vdrburn-dvd.sh~ burn-0.2.2/vdrburn-dvd.sh
+--- burn-0.2.2/vdrburn-dvd.sh~ 2011-10-10 21:59:34.000000000 +0300
++++ burn-0.2.2/vdrburn-dvd.sh 2013-02-24 23:51:46.937031069 +0200
+@@ -245,15 +245,15 @@ case $1 in
echo "Deleting $TEMP_PATH/INDEX_${TRACK_ON_DVD}"
rm -rf "$TEMP_PATH/INDEX_${TRACK_ON_DVD}"
echo "Creating "$RECORDING_DMH"/dvd.vdr"
- cp "$CONFIG_PATH/counters/standard" "$RECORDING_DMH"/dvd.vdr
-+ cp "/var/lib/vdr/burn/counters/standard" "$RECORDING_DMH/dvd.vdr"
++ cp "/var/lib/vdr/burn/counters/standard" "$RECORDING_DMH"/dvd.vdr
printf "%04d\n" $(echo ${TRACK_ON_DVD} | sed 's/^0*//') >> "$RECORDING_DMH"/dvd.vdr
;;
@@ -106,8 +117,19 @@
+ cp "/var/lib/vdr/burn/counters/standard" "$DVDAUTHOR_PATH/dvd.vdr"
+ ((DVD_ID = `cat /var/lib/vdr/burn/counters/standard | sed "s/^0*//"` + 1))
+ printf "%04d\n" $DVD_ID > "/var/lib/vdr/burn/counters/standard"
-+
;;
mkiso)
-
+diff -up burn-0.2.2/vdrburn-dvd.sh~ burn-0.2.2/vdrburn-dvd.sh
+--- burn-0.2.2/vdrburn-dvd.sh~ 2011-10-10 21:59:34.000000000 +0300
++++ burn-0.2.2/vdrburn-dvd.sh 2013-03-17 02:27:44.741667614 +0200
+@@ -93,7 +93,8 @@ case $1 in
+ fi
+
+ $IO_NICE $JAVA_EXE -Djava.awt.headless=true \
+- -jar $PROJECTX_JAR \
++ -cp $PROJECTX_JAR:$(build-classpath apache-commons-net jakarta-oro) \
++ net.sourceforge.dvb.projectx.common.Start \
+ -ini $CONFIG_PATH/ProjectX.ini \
+ $TTXT_OPTS \
+ $CUT -id $USED_TRACKS \
Index: vdr-burn.spec
===================================================================
RCS file: /cvs/free/rpms/vdr-burn/F-18/vdr-burn.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- vdr-burn.spec 23 Apr 2013 09:11:20 -0000 1.14
+++ vdr-burn.spec 11 Jun 2013 17:09:44 -0000 1.15
@@ -1,32 +1,32 @@
-%define pname burn
-%define gver 0.1.3
+%global gver 0.1.3
+%global pname burn
+%global __provides_exclude_from ^%{vdr_libdir}/.*\\.so.*$
Name: vdr-%{pname}
Version: 0.2.2
-Release: 2%{?dist}
+Release: 5%{?dist}
Summary: DVD writing plugin for VDR
-Group: Applications/Multimedia
# genindex is GPLv2+, rest GPL+
License: GPL+ and GPLv2+
URL: http://projects.vdr-developer.org/projects/plg-burn
-Source0: http://projects.vdr-developer.org/attachments/download/832/%{name}-%{vers...
+Source0: http://projects.vdr-developer.org/attachments/download/1252/%{name}-%{ver...
Source1: %{name}.conf
Source2: http://www.muempf.de/down/genindex-%{gver}.tar.gz
-Patch0: %{name}-%{version}-config.patch
-Patch1: %{name}-%{version}-Makefile.patch
+Patch0: %{name}-0.2.2-config.patch
-BuildRequires: vdr-devel >= 1.7.31
+BuildRequires: vdr-devel >= 1.7.38
BuildRequires: boost-devel
-BuildRequires: gd-devel
+BuildRequires: gd-devel >= 2.0.33-9.3
+BuildRequires: gettext
Requires: vdr(abi)%{?_isa} = %{vdr_apiversion}
-Requires: ProjectX
+Requires: ProjectX >= 0.90.4.00.b29
Requires: m2vrequantiser
Requires: dvdauthor
Requires: mjpegtools
Requires: dvd+rw-tools
-Requires: dejavu-lgc-sans-fonts
-Conflicts: ProjectX < 0.90.4.00.b29
+Requires: dejavu-sans-fonts
+Requires: pxsup2dast
%description
This plugin enables VDR to write compliant DVDs from VDR recordings
@@ -40,14 +40,13 @@
%prep
%setup -q -c -a 2
-cd burn-0.2.2
-find -name CVS | xargs rm -rf
-chmod -c -x *.[ch] genindex/*.[ch] proctools/*.cc proctools/*.h README
-%patch0 -p0
-%patch1 -p1
+mv %{pname}-%{version} burn ; cd burn
+
+%patch0 -p1
sed -i -e 's|/var/lib/vdr/|%{vdr_vardir}/|g' chain-archive.c jobs.c vdrburn-*.sh
-sed -i -e 's|"Vera"|"DejaVuLGCSans"|g' skins.c
+
+sed -i -e 's|"Vera"|"DejaVuSans"|g' skins.c
cd ../genindex-%{gver}
sed -i -e 's/-g -O2/$(RPM_OPT_FLAGS)/' Makefile
@@ -56,52 +55,44 @@
%build
-make -C burn-%{version} %{?_smp_mflags} CXXFLAGS="$RPM_OPT_FLAGS -fPIC" LIBDIR=. VDRDIR=. LOCALEDIR=./locale all
+# main build not parallel clean (libvdr-burn.so -> proctools/libproctools.a)
+make -C burn ISODIR=%{vdr_videodir} all
make -C genindex-%{gver} %{?_smp_mflags}
%install
-install -dm 755 $RPM_BUILD_ROOT%{vdr_plugindir}/bin
-#install -pm 755 burn-%{version}/libvdr-%{pname}.so.%{vdr_apiversion} $RPM_BUILD_ROOT%{vdr_plugindir}
-install -pm 755 burn-%{version}/libvdr-%{pname}.so $RPM_BUILD_ROOT%{vdr_plugindir}/libvdr-%{pname}.so.%{vdr_apiversion}
-install -pm 755 burn-%{version}/*.sh genindex-%{gver}/genindex \
- $RPM_BUILD_ROOT%{vdr_plugindir}/bin
+%make_install -C burn
+install -dm 755 $RPM_BUILD_ROOT%{vdr_libdir}/bin
+install -pm 755 burn/*.sh genindex-%{gver}/genindex \
+ $RPM_BUILD_ROOT%{vdr_libdir}/bin
install -dm 755 $RPM_BUILD_ROOT%{vdr_configdir}/plugins/burn/skins
-cp -pR burn-%{version}/burn/* $RPM_BUILD_ROOT%{vdr_configdir}/plugins/burn
+cp -pR burn/burn/* $RPM_BUILD_ROOT%{vdr_configdir}/plugins/burn
rm -rf $RPM_BUILD_ROOT%{vdr_configdir}/plugins/burn/{counters,fonts/*}
-ln -s %{_datadir}/fonts/dejavu/DejaVuLGCSans.ttf \
+ln -s %{_datadir}/fonts/dejavu/DejaVuSans.ttf \
$RPM_BUILD_ROOT%{vdr_configdir}/plugins/burn/fonts/
-install -Dpm 644 burn-%{version}/burn/counters/standard \
+install -Dpm 644 burn/burn/counters/standard \
$RPM_BUILD_ROOT%{vdr_vardir}/burn/counters/standard
install -Dpm 644 %{SOURCE1} \
$RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}.conf
-
-# locale
-install -dm 755 $RPM_BUILD_ROOT%{_datadir}/locale
-cp -pR burn-%{version}/locale/* $RPM_BUILD_ROOT%{_datadir}/locale
-
%find_lang %{name}
-%post
-if [ $1 -gt 1 ] ; then # maybe upgrading from < 0.1.0?
- %{__perl} -pi -e 's/^.*(burnmark|handlearchived)\.sh.*\n$//' \
- %{vdr_configdir}/reccmds.conf >/dev/null 2>&1 || :
-fi
%files -f %{name}.lang
-%defattr(-,root,root,-)
-%doc burn-%{version}/COPYING burn-%{version}/HISTORY burn-%{version}/README README.genindex
+%doc burn/COPYING burn/HISTORY burn/README README.genindex
%config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}.conf
%config(noreplace) %{vdr_configdir}/plugins/%{pname}/
-%{vdr_plugindir}/bin/genindex
-%{vdr_plugindir}/bin/vdrburn-archive.sh
-%{vdr_plugindir}/bin/vdrburn-dvd.sh
-%{vdr_plugindir}/libvdr-%{pname}.so.%{vdr_apiversion}
+%{vdr_libdir}/bin/genindex
+%{vdr_libdir}/bin/vdrburn-archive.sh
+%{vdr_libdir}/bin/vdrburn-dvd.sh
+%{vdr_libdir}/libvdr-%{pname}.so.%{vdr_apiversion}
%defattr(-,%{vdr_user},root)
-%config(noreplace) %{vdr_vardir}/%{pname}
-
+%config(noreplace) %{vdr_vardir}/burn/
+%defattr(-,root,root,-)
%changelog
+* Sun Apr 28 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 0.2.2-3
+- https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
* Mon Apr 22 2013 Martin Gansser <martinkg(a)fedoraproject.org> - 0.2.2-2
- added Makefile locale fix
- changed build option for new plugin Makefile
@@ -179,7 +170,7 @@
* Tue Dec 12 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.1.0-0.6.pre21
- 0.1.0-pre21, include private copy of genindex (0.1.3) for now.
-* Sat Nov 4 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.0.009-16
+* Sat Nov 4 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.0.009-16
- Rebuild for VDR 1.4.4.
* Fri Oct 06 2006 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> 0.0.009-15
@@ -260,7 +251,7 @@
- Rebuild for VDR 1.3.33.
* Sun Sep 11 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.0.6g-1.lvn.6.pre3
-- Rebuild for VDR 1.3.32.
+- Rebuild for VDR 1.3.32
* Tue Aug 30 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.0.6g-1.lvn.5.pre3
- Rebuild for VDR 1.3.31.
@@ -276,3 +267,4 @@
* Fri Aug 12 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.0.6g-1.lvn.1.pre3
- Update URLs.
+
--- vdr-burn-0.2.2-Makefile.patch DELETED ---
10 years, 10 months
rpms/mlt/F-19 mlt.spec,1.36,1.37
by Rex Dieter
Author: rdieter
Update of /cvs/free/rpms/mlt/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv10142
Modified Files:
mlt.spec
Log Message:
* Mon Jun 10 2013 Rex Dieter <rdieter(a)fedoraproject.org> 0.8.8-5
- mlt-ruby FTBFS, omit until fixed (#2816)
Index: mlt.spec
===================================================================
RCS file: /cvs/free/rpms/mlt/F-19/mlt.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- mlt.spec 26 May 2013 21:51:15 -0000 1.36
+++ mlt.spec 11 Jun 2013 01:19:42 -0000 1.37
@@ -7,7 +7,7 @@
Summary: Toolkit for broadcasters, video editors, media players, transcoders
Name: mlt
Version: 0.8.8
-Release: 4%{?dist}
+Release: 5%{?dist}
License: GPLv2+ and LGPLv2+
URL: http://www.mltframework.org/twiki/bin/view/MLT/
@@ -18,6 +18,7 @@
BuildRequires: frei0r-devel
BuildRequires: ffmpeg-devel
BuildRequires: qt4-devel
+BuildRequires: kdelibs4-devel
BuildRequires: libquicktime-devel
BuildRequires: SDL-devel
BuildRequires: gtk2-devel
@@ -31,9 +32,14 @@
BuildRequires: sox-devel
BuildRequires: swig
BuildRequires: python-devel
-BuildRequires: ruby-devel ruby
BuildRequires: SDL_image-devel
+%if 0%{?ruby:1}
+BuildRequires: ruby-devel ruby
+%else
+Obsoletes: mlt-ruby < 0.8.8-5
+%endif
+
%global __provides_exclude_from %{?__provides_exclude_from:%__provides_exclude_from|}%{php_extdir}/.*\\.so$
@@ -87,6 +93,7 @@
%prep
%setup -q
+
find ./ -name configure -exec chmod 755 {} \;
chmod 755 src/modules/lumas/create_lumas
chmod 644 src/modules/qimage/kdenlivetitle_wrapper.cpp
@@ -94,7 +101,7 @@
chmod -x demo/demo
-# Don't optimize (breaks debugging)
+# Don't overoptimize (breaks debugging)
sed -i -e '/fomit-frame-pointer/d' configure
sed -i -e '/ffast-math/d' configure
@@ -113,7 +120,7 @@
--qimage-includedir=%{_qt4_headerdir} \
--rename-melt=%{name}-melt \
--avformat-swscale \
- --swig-languages='python php ruby'
+ --swig-languages="python php %{?ruby:ruby}"
make %{?_smp_mflags}
@@ -124,9 +131,11 @@
# manually do what 'make install' skips
install -D -pm 0644 src/swig/python/mlt.py $RPM_BUILD_ROOT%{python_sitelib}/mlt.py
+%if 0%{?ruby}
install -D -pm 0755 src/swig/ruby/play.rb $RPM_BUILD_ROOT%{ruby_sitelib}/play.rb
install -D -pm 0755 src/swig/ruby/thumbs.rb $RPM_BUILD_ROOT%{ruby_sitelib}/thumbs.rb
install -D -pm 0755 src/swig/ruby/mlt.so $RPM_BUILD_ROOT%{ruby_sitearch}/mlt.so
+%endif
install -D -pm 0755 src/swig/python/_mlt.so $RPM_BUILD_ROOT%{python_sitearch}/_mlt.so
install -D -pm 0755 src/swig/php/mlt.so $RPM_BUILD_ROOT%{php_extdir}/mlt.so
install -d $RPM_BUILD_ROOT%{_sysconfdir}/php.d
@@ -168,11 +177,13 @@
%{python_sitelib}/mlt.py*
%{python_sitearch}/_mlt.so
+%if 0%{?ruby}
%files ruby
%defattr(-,root,root,-)
%{ruby_sitelib}/play.rb
%{ruby_sitelib}/thumbs.rb
%{ruby_sitearch}/mlt.so
+%endif
%files php
%defattr(-,root,root,-)
@@ -191,6 +202,9 @@
%changelog
+* Mon Jun 10 2013 Rex Dieter <rdieter(a)fedoraproject.org> 0.8.8-5
+- mlt-ruby FTBFS, omit until fixed (#2816)
+
* Sun May 26 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 0.8.8-4
- Rebuilt for x264/FFmpeg
10 years, 10 months
rpms/mlt/devel mlt.spec,1.36,1.37
by Rex Dieter
Author: rdieter
Update of /cvs/free/rpms/mlt/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv9948
Modified Files:
mlt.spec
Log Message:
* Mon Jun 10 2013 Rex Dieter <rdieter(a)fedoraproject.org> 0.8.8-5
- mlt-ruby FTBFS, omit until fixed (#2816)
Index: mlt.spec
===================================================================
RCS file: /cvs/free/rpms/mlt/devel/mlt.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- mlt.spec 26 May 2013 21:50:56 -0000 1.36
+++ mlt.spec 11 Jun 2013 01:11:22 -0000 1.37
@@ -7,7 +7,7 @@
Summary: Toolkit for broadcasters, video editors, media players, transcoders
Name: mlt
Version: 0.8.8
-Release: 4%{?dist}
+Release: 5%{?dist}
License: GPLv2+ and LGPLv2+
URL: http://www.mltframework.org/twiki/bin/view/MLT/
@@ -18,6 +18,7 @@
BuildRequires: frei0r-devel
BuildRequires: ffmpeg-devel
BuildRequires: qt4-devel
+BuildRequires: kdelibs4-devel
BuildRequires: libquicktime-devel
BuildRequires: SDL-devel
BuildRequires: gtk2-devel
@@ -31,9 +32,14 @@
BuildRequires: sox-devel
BuildRequires: swig
BuildRequires: python-devel
-BuildRequires: ruby-devel ruby
BuildRequires: SDL_image-devel
+%if 0%{?ruby:1}
+BuildRequires: ruby-devel ruby
+%else
+Obsoletes: mlt-ruby < 0.8.8-5
+%endif
+
%global __provides_exclude_from %{?__provides_exclude_from:%__provides_exclude_from|}%{php_extdir}/.*\\.so$
@@ -87,6 +93,7 @@
%prep
%setup -q
+
find ./ -name configure -exec chmod 755 {} \;
chmod 755 src/modules/lumas/create_lumas
chmod 644 src/modules/qimage/kdenlivetitle_wrapper.cpp
@@ -94,7 +101,7 @@
chmod -x demo/demo
-# Don't optimize (breaks debugging)
+# Don't overoptimize (breaks debugging)
sed -i -e '/fomit-frame-pointer/d' configure
sed -i -e '/ffast-math/d' configure
@@ -113,7 +120,7 @@
--qimage-includedir=%{_qt4_headerdir} \
--rename-melt=%{name}-melt \
--avformat-swscale \
- --swig-languages='python php ruby'
+ --swig-languages="python php %{?ruby:ruby}"
make %{?_smp_mflags}
@@ -124,9 +131,11 @@
# manually do what 'make install' skips
install -D -pm 0644 src/swig/python/mlt.py $RPM_BUILD_ROOT%{python_sitelib}/mlt.py
+%if 0%{?ruby}
install -D -pm 0755 src/swig/ruby/play.rb $RPM_BUILD_ROOT%{ruby_sitelib}/play.rb
install -D -pm 0755 src/swig/ruby/thumbs.rb $RPM_BUILD_ROOT%{ruby_sitelib}/thumbs.rb
install -D -pm 0755 src/swig/ruby/mlt.so $RPM_BUILD_ROOT%{ruby_sitearch}/mlt.so
+%endif
install -D -pm 0755 src/swig/python/_mlt.so $RPM_BUILD_ROOT%{python_sitearch}/_mlt.so
install -D -pm 0755 src/swig/php/mlt.so $RPM_BUILD_ROOT%{php_extdir}/mlt.so
install -d $RPM_BUILD_ROOT%{_sysconfdir}/php.d
@@ -168,11 +177,13 @@
%{python_sitelib}/mlt.py*
%{python_sitearch}/_mlt.so
+%if 0%{?ruby}
%files ruby
%defattr(-,root,root,-)
%{ruby_sitelib}/play.rb
%{ruby_sitelib}/thumbs.rb
%{ruby_sitearch}/mlt.so
+%endif
%files php
%defattr(-,root,root,-)
@@ -191,6 +202,9 @@
%changelog
+* Mon Jun 10 2013 Rex Dieter <rdieter(a)fedoraproject.org> 0.8.8-5
+- mlt-ruby FTBFS, omit until fixed (#2816)
+
* Sun May 26 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 0.8.8-4
- Rebuilt for x264/FFmpeg
10 years, 10 months
rpms/xorg-x11-drv-nvidia/devel xorg-x11-drv-nvidia.spec,1.103,1.104
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv3108
Modified Files:
xorg-x11-drv-nvidia.spec
Log Message:
Fix
Index: xorg-x11-drv-nvidia.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel/xorg-x11-drv-nvidia.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- xorg-x11-drv-nvidia.spec 9 Jun 2013 16:14:22 -0000 1.103
+++ xorg-x11-drv-nvidia.spec 9 Jun 2013 16:17:00 -0000 1.104
@@ -8,7 +8,7 @@
Name: xorg-x11-drv-nvidia
Epoch: 1
Version: 319.23
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -329,6 +329,9 @@
%changelog
+* Sun Jun 09 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:319.23-4
+- Fix C&P error with the serie
+
* Sat Jun 08 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:319.23-3
- Few resync with devel
- Disable execstack fix
10 years, 10 months
rpms/xorg-x11-drv-nvidia/devel xorg-x11-drv-nvidia.spec,1.102,1.103
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv2891/devel
Modified Files:
xorg-x11-drv-nvidia.spec
Log Message:
Fix c&p error
Index: xorg-x11-drv-nvidia.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel/xorg-x11-drv-nvidia.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- xorg-x11-drv-nvidia.spec 8 Jun 2013 13:56:21 -0000 1.102
+++ xorg-x11-drv-nvidia.spec 9 Jun 2013 16:14:22 -0000 1.103
@@ -1,4 +1,4 @@
-%global _nvidia_serie nvidia-304xx
+%global _nvidia_serie nvidia
%global _nvidia_libdir %{_libdir}/%{_nvidia_serie}
%global _nvidia_xorgdir %{_nvidia_libdir}/xorg
10 years, 10 months
rpms/xorg-x11-drv-nvidia/F-19 xorg-x11-drv-nvidia.spec,1.101,1.102
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv2891/F-19
Modified Files:
xorg-x11-drv-nvidia.spec
Log Message:
Fix c&p error
Index: xorg-x11-drv-nvidia.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-19/xorg-x11-drv-nvidia.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- xorg-x11-drv-nvidia.spec 8 Jun 2013 13:56:21 -0000 1.101
+++ xorg-x11-drv-nvidia.spec 9 Jun 2013 16:14:23 -0000 1.102
@@ -1,4 +1,4 @@
-%global _nvidia_serie nvidia-304xx
+%global _nvidia_serie nvidia
%global _nvidia_libdir %{_libdir}/%{_nvidia_serie}
%global _nvidia_xorgdir %{_nvidia_libdir}/xorg
@@ -8,7 +8,7 @@
Name: xorg-x11-drv-nvidia
Epoch: 1
Version: 319.23
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -329,6 +329,9 @@
%changelog
+* Sun Jun 09 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:319.23-4
+- Fix C&P error with the serie
+
* Sat Jun 08 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:319.23-3
- Few resync with devel
- Disable execstack fix
10 years, 10 months
rpms/moc/F-18 moc-r2506+fsf_addr.patch, NONE, 1.1 moc.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Antonio
Author: sagitter
Update of /cvs/free/rpms/moc/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv23265/F-18
Modified Files:
.cvsignore sources
Added Files:
moc-r2506+fsf_addr.patch moc.spec
Log Message:
moc-r2506+fsf_addr.patch:
xing.c | 4 ++--
xing.h | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
--- NEW FILE moc-r2506+fsf_addr.patch ---
diff --git a/decoder_plugins/mp3/xing.c b/decoder_plugins/mp3/xing.c
index 743cc3d..68a01dc 100644
--- a/decoder_plugins/mp3/xing.c
+++ b/decoder_plugins/mp3/xing.c
@@ -13,8 +13,8 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
* $Id: xing.c,v 1.5 2002/11/18 16:32:21 daper Exp $
*/
diff --git a/decoder_plugins/mp3/xing.h b/decoder_plugins/mp3/xing.h
index 8cb1c2a..1f26e09 100644
--- a/decoder_plugins/mp3/xing.h
+++ b/decoder_plugins/mp3/xing.h
@@ -13,8 +13,8 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
* $Id: xing.h,v 1.3 2002/10/04 13:38:09 daper Exp $
*/
--- NEW FILE moc.spec ---
# Set up a new macro to define MOC's 'mocp' executable
%global exec mocp
Name: moc
Summary: Music on Console - Console audio player for Linux/UNIX
Version: 2.5.0
Release: 0.9.beta1%{?dist}
License: GPLv2+ and GPLv3+
URL: http://www.moc.daper.net
Source0: http://ftp.daper.net/pub/soft/moc/unstable/%{name}-%{version}-beta1.tar.bz2
## This patch corrects all outdated FSF address
Patch0: %{name}-r2506+fsf_addr.patch
BuildRequires: pkgconfig(ncurses)
BuildRequires: pkgconfig(alsa)
BuildRequires: pkgconfig(jack)
BuildRequires: pkgconfig(libcurl)
BuildRequires: pkgconfig(samplerate)
BuildRequires: ffmpeg-devel
BuildRequires: pkgconfig(taglib)
BuildRequires: pkgconfig(speex)
BuildRequires: libmad-devel
BuildRequires: pkgconfig(id3tag)
BuildRequires: pkgconfig(vorbis)
BuildRequires: pkgconfig(flac)
BuildRequires: pkgconfig(zlib)
BuildRequires: pkgconfig(sndfile)
BuildRequires: pkgconfig(libmodplug)
BuildRequires: pkgconfig(libtimidity)
BuildRequires: pkgconfig(wavpack)
BuildRequires: libdb-devel
BuildRequires: libtool-ltdl-devel
BuildRequires: gettext-devel
BuildRequires: pkgconfig(opus)
BuildRequires: libtool
BuildRequires: librcc-devel
Requires: ffmpeg
Requires: opus
%description
MOC (music on console) is a console audio player for LINUX/UNIX designed to be
powerful and easy to use. You just need to select a file from some directory
using the menu similar to Midnight Commander, and MOC will start playing all
files in this directory beginning from the chosen file.
%prep
%setup -q -n %{name}-%{version}-beta1
%patch0 -p1 -b %{name}-r2506+fsf_addr.patch
%build
%configure --disable-static --with-rcc \
--with-oss --with-alsa --with-jack --with-aac --with-mp3 \
--with-musepack --with-vorbis --with-flac --with-wavpack \
--with-sndfile --with-modplug --with-ffmpeg --with-speex \
--with-samplerate --with-curl
make %{?_smp_mflags}
%install
%make_install
rm -rf $RPM_BUILD_ROOT%{_datadir}/doc
rm -f $RPM_BUILD_ROOT%_libdir/*.la
rm -f $RPM_BUILD_ROOT%_libdir/moc/decoder_plugins/*.la
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
%doc README README_equalizer AUTHORS ChangeLog COPYING config.example keymap.example NEWS
%dir %{_datadir}/%{name}
%{_bindir}/%{exec}
%{_datadir}/%{name}/themes/*
%{_mandir}/man1/%{exec}.*
%dir %{_libdir}/%{name}
%{_libdir}/%{name}/decoder_plugins
%changelog
* Sat Jun 08 2013 Antonio Trande <sagitter(a)fedoraproject.org> 2.5.0-0.9.beta1
- Removed some explicit Requires (curl, jack-audio-connection-kit, ncurses, speex)
* Fri Jun 07 2013 Antonio Trande <sagitter(a)fedoraproject.org> 2.5.0-0.8.beta1
- Fixed Source0 line
- Package owns %%{_libdir}/%%{name} directory
* Mon May 20 2013 Antonio Trande <sagitter(a)fedoraproject.org> 2.5.0-0.7.beta1
- Dist tag changed to %%{?dist}
* Tue Apr 09 2013 Antonio Trande <sagitter(a)fedoraproject.org> 2.5.0-0.6.beta1
- Removed autoreconf task from %%build section
* Fri Apr 05 2013 Antonio Trande <sagitter(a)fedoraproject.org> 2.5.0-0.5.beta1
- Removed libRCC explicit require
* Sun Mar 03 2013 Antonio Trande <sagitter(a)fedoraproject.org> 2.5.0-0.4.beta1
- Removed DESTDIR from %%make_install
- Changed source link with a public one
- Set up a new macro to define MOC's 'mocp' executable
- Added %%{name} prefix to the patch
* Tue Dec 25 2012 Antonio Trande <sagitter(a)fedoraproject.org> 2.5.0-0.3.beta1
- Added librcc support (fixes encoding in broken mp3 tags)
* Mon Oct 22 2012 Antonio Trande <sagitter(a)fedoraproject.org> 2.5.0-0.2.beta1
- Added patch to fix FSF address
* Mon Oct 22 2012 Antonio Trande <sagitter(a)fedoraproject.org> 2.5.0-0.1.beta1
- 2.5.0-beta1
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/moc/F-18/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 8 Jun 2013 14:24:00 -0000 1.1
+++ .cvsignore 8 Jun 2013 19:51:22 -0000 1.2
@@ -0,0 +1 @@
+moc-2.5.0-beta1.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/moc/F-18/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 8 Jun 2013 14:24:00 -0000 1.1
+++ sources 8 Jun 2013 19:51:22 -0000 1.2
@@ -0,0 +1 @@
+795ecba86847e082aa2f21937cc04804 moc-2.5.0-beta1.tar.bz2
10 years, 10 months