Author: goeran Update of /cvs/free/rpms/ProjectX/F-13 In directory se02.es.rpmfusion.net:/tmp/cvs-serv6883/F-13 Modified Files: .cvsignore sources Added Files: ProjectX-0.90.4.00-20100801cvs.sysjava.patch ProjectX-0.90.4.00-20100806cvs.desktop.patch ProjectX-0.90.4.00-20100806cvs.helpfiles.patch ProjectX-snapshot.sh ProjectX.spec projectx Log Message: Importing ProjectX to F-13 branch in CVS. ProjectX-0.90.4.00-20100801cvs.sysjava.patch: build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- NEW FILE ProjectX-0.90.4.00-20100801cvs.sysjava.patch --- --- build.sh~ 2007-01-25 21:06:14.000000000 +0100 +++ build.sh 2009-12-01 14:27:48.000000000 +0100 @@ -19,7 +19,7 @@ fi mkdir -p build -javac -encoding "ISO-8859-1" -deprecation -O -g:none -classpath lib/commons-net-1.3.0.jar:lib/jakarta-oro-2.0.8.jar -d build @sources.lst +javac -encoding "ISO-8859-1" -deprecation -O -g:none -classpath $(build-classpath commons-net jakarta-oro) -d build @sources.lst cp ./resources/* ./build jar cfvm ProjectX.jar MANIFEST.MF -C build . ProjectX-0.90.4.00-20100806cvs.desktop.patch: projectx.desktop | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) --- NEW FILE ProjectX-0.90.4.00-20100806cvs.desktop.patch --- --- projectx.desktop~ 2005-09-10 18:03:04.000000000 +0200 +++ projectx.desktop 2010-08-06 23:05:50.000000000 +0200 @@ -1,10 +1,13 @@ [Desktop Entry] +Version=1.0 X-SuSE-translate=true -Categories=AudioVideo;AudioVideoEditing +Categories=AudioVideo;AudioVideoEditing; Comment=A video editing and demultiplexing tool +Comment[sv]=Ett videoredigerings- och demultiplexningsverktyg Encoding=UTF-8 -Exec=java -jar /usr/share/projectx/ProjectX.jar -GenericName=ProjectX +Exec=/usr/bin/projectx +GenericName=DVB file manager +GenericName[sv]=DVB-filhanterare Icon=package_multimedia Name=ProjectX Name[de]=ProjectX ProjectX-0.90.4.00-20100806cvs.helpfiles.patch: build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- NEW FILE ProjectX-0.90.4.00-20100806cvs.helpfiles.patch --- --- build.sh~ 2010-08-07 11:51:22.000000000 +0200 +++ build.sh 2010-08-07 13:08:26.000000000 +0200 @@ -20,7 +20,7 @@ mkdir -p build javac -encoding "ISO-8859-1" -deprecation -O -g:none -classpath $(build-classpath commons-net jakarta-oro) -d build @sources.lst -cp ./resources/* ./build +cp -r htmls ./resources/* ./build jar cfvm ProjectX.jar MANIFEST.MF -C build . ###################################################### --- NEW FILE ProjectX-snapshot.sh --- #! /bin/bash set -e tmp=$(mktemp -d) trap cleanup EXIT cleanup() { set +e [ -z "$tmp" -o ! -d "$tmp" ] || rm -rf "$tmp" } pwd=$(pwd) date=$(date +%Y%m%d) (cd $tmp cvs -q -d:pserver:anonymous@project-x.cvs.sourceforge.net:/cvsroot/project-x \ co -D $date -d ProjectX-0.90.4.00-${date}cvs Project-X) tar --create --xz \ --exclude-vcs --exclude=lib --exclude '*.cmd' --exclude '*.bat' \ --file=ProjectX-0.90.4.00-${date}cvs.tar.xz \ --directory=$tmp ProjectX-0.90.4.00-${date}cvs --- NEW FILE ProjectX.spec --- %global with_gcj %{!?_without_gcj:1}%{?_without_gcj:0} %global cvs 20100806cvs Name: ProjectX Version: 0.90.4.00 Release: 7.%cvs%{?dist} Summary: DVB video editing and demultiplexing tool Summary(sv): Verktyg för redigering och demultiplexning av DVB-video Group: Applications/Multimedia License: GPLv2+ URL: http://project-x.sourceforge.net/ # A CVS snapshot is used rather than the latest official release, see # https://bugzilla.rpmfusion.org/show_bug.cgi?id=985#c6 # # Use the ProjectX-snapshot.sh (source 1) script to reproduce. Before # the first time, do this: # # cvs -d:pserver:anonymous@project-x.cvs.sourceforge.net:/cvsroot/project-x login Source0: %name-%version-%cvs.tar.xz Source1: %name-snapshot.sh Source2: projectx Patch0: %name-0.90.4.00-20100801cvs.sysjava.patch Patch1: %name-0.90.4.00-20100806cvs.desktop.patch Patch2: %name-0.90.4.00-20100806cvs.helpfiles.patch %if %with_gcj BuildRequires: java-gcj-compat-devel >= 1.0.31 Requires(post): java-gcj-compat >= 1.0.31 Requires(postun): java-gcj-compat >= 1.0.31 %else BuildArch: noarch %endif BuildRequires: java-devel >= 1.2.2 BuildRequires: jakarta-oro BuildRequires: commons-net BuildRequires: jpackage-utils BuildRequires: desktop-file-utils Requires: java >= 1.2.2 Requires: jakarta-oro Requires: commons-net Requires: jpackage-utils %description In many countries digital radio and television uses the Digital Video Broadcasting (DVB) standard to broadcast its data. Project X is a tool to analyse and manipulate these DVB MPEG data streams. It can cut and demultiplex them and it tries its best to handle and repair many stream types and show what went wrong on reception. %description -l sv I många länder använder digital radio och television DVB-standarden (Digital Video Broadcasting) för att sända sina data. Project X är ett verktyg för att analysera och hantera dessa DVB-MPEG-dataströmmar. Det kan dela upp och demultiplexa dem och det gör sitt bästa för att hantera och reparera många strömtyper och visa vad som gick fel vid mottagningen. %prep %setup0 -q -n %name-%version-%cvs %patch0 %patch1 %patch2 sed -i '/Class-Path/d' MANIFEST.MF %build sh -ex build.sh %install install -d %buildroot%_javadir %buildroot%_bindir cp -p %name.jar %buildroot%_javadir %if %with_gcj %_bindir/aot-compile-rpm %endif install %SOURCE2 %buildroot%_bindir desktop-file-install --dir=%buildroot%_datadir/applications projectx.desktop %post %if %with_gcj if [ -x %_bindir/rebuild-gcj-db ] then %_bindir/rebuild-gcj-db fi %endif %postun %if %with_gcj if [ -x %_bindir/rebuild-gcj-db ] then %_bindir/rebuild-gcj-db fi %endif %files %defattr(-,root,root,-) %doc Copying ReadMe.txt %_bindir/projectx %_javadir/%name.jar %_datadir/applications/projectx.desktop %if %with_gcj %_libdir/gcj/%name %endif %changelog * Tue Aug 10 2010 Göran Uddeborg <goeran(a)uddeborg.se&gt; 0.90.4.00-7.20100806cvs - Remove the requirement on Java 1.6. GCJ (ECJ) is fine for bytecode compilation. * Sat Aug 7 2010 Göran Uddeborg <goeran(a)uddeborg.se&gt; 0.90.4.00-6.20100806cvs - Added version number to sysjava patch, indicating for which version it was made. - Require Java 1.6, to get a newer compiler than GCJ's. - Omit "lib" subdirectory and other bits not needed on Linux from the archive. Takes away the need to remove "lib" in "prep" section. - Compress the archive with xz rather than bzip2. - Update to snapshot from cvs 2010-08-06. - Made a separate patch file for the desktop file modifications. - Put the html help documentation in the jar archive, so it can be found in installed mode. * Mon Aug 2 2010 Göran Uddeborg <goeran(a)uddeborg.se&gt; 0.90.4.00-5.20100801cvs - Include the cvs date in the source package. - Explicitly prune empty directories when checking out from CVS. - Include a little script that creates the tar file. - Make the wrapper script a separate source file. - Changed BuildArchitectures tag to BuildArch. * Sun Aug 1 2010 Göran Uddeborg <goeran(a)uddeborg.se&gt; 0.90.4.00-4.20100801cvs - Switch to single character spacing of sentences in the description. - Add comment on how to recreate the tar archive. - Update to snapshot from cvs 2010-08-01. - Do double line spacing between major sections. - Removed cleaning in install and clean sections, no longer needed from F13. * Mon Dec 6 2009 Göran Uddeborg <goeran(a)uddeborg.se&gt; 0.90.4.00-3.20091201cvs - BuildRequires entries on separate lines - Don't point out Europe in the description, DVB is used in more places. - Build wrapper script using jpackage-utils. - Add a desktop file. - Explicitly remove supplied libs. - Add GCJ AOT libraries. - Update to snapshot from cvs 2009-12-01. * Sun Nov 29 2009 Göran Uddeborg <goeran(a)uddeborg.se&gt; 0.90.4.00-3 - Adapted to Fedora packaging standards in preparation for submission to RPM Fusion. * Tue Jan 8 2008 Göran Uddeborg <goeran(a)uddeborg.se&gt; 0.90.4.00-2 - Escape dollar in here-script. - Use system version of libraries. * Sun Jan 6 2008 Göran Uddeborg <goeran(a)uddeborg.se&gt; 0.90.4.00-1 - Initial build. --- NEW FILE projectx --- #! /bin/bash . /usr/share/java-utils/java-functions MAIN_CLASS=net.sourceforge.dvb.projectx.common.Start set_classpath ProjectX commons-net jakarta-oro run "$@" Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/ProjectX/F-13/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 3 Sep 2010 21:16:52 -0000 1.1 +++ .cvsignore 7 Sep 2010 12:02:22 -0000 1.2 @@ -0,0 +1 @@ +ProjectX-0.90.4.00-20100806cvs.tar.xz Index: sources =================================================================== RCS file: /cvs/free/rpms/ProjectX/F-13/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 3 Sep 2010 21:16:52 -0000 1.1 +++ sources 7 Sep 2010 12:02:22 -0000 1.2 @@ -0,0 +1 @@ +6ebcb2b470fc492ad6577884e60d8dfe ProjectX-0.90.4.00-20100806cvs.tar.xz