From e2e73acb3e9bd5c06d6ddd801ba89729d321477a Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Sat, 17 Nov 2007 17:39:35 +0000 Subject: [PATCH 1/6] Initialize branch F-8 for AcetoneISO --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..e9e7ccd --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-8 From 950ba012d88d7d8a8cb7a351df86ac4d16c95060 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Mon, 19 Nov 2007 22:01:07 +0000 Subject: [PATCH 2/6] Branching. --- AcetoneISO.spec | 102 ++++++++++++++++++++++++++++++++++++++++++++++++ sources | 1 + 2 files changed, 103 insertions(+) create mode 100644 AcetoneISO.spec diff --git a/AcetoneISO.spec b/AcetoneISO.spec new file mode 100644 index 0000000..72e94c6 --- /dev/null +++ b/AcetoneISO.spec @@ -0,0 +1,102 @@ +Name: AcetoneISO +Version: 6.7 +Release: 2%{?dist} +Summary: CD/DVD Image Manipulator +Group: Applications/Archiving +License: GPL +URL: http://www.acetoneteam.org/ +#Source0: http://www.acetoneteam.org/Archivia/%{name}-%{version}.tar.gz +# Upstream source includes poweriso binary, closed source, no redistribution permission. +Source0: %{name}-%{version}-clean.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: kdewebdev-devel, desktop-file-utils +Requires: p7zip, xbiso, k3b, kdebase, arts, cdrdao +# Overkill, but I'm being thorough +Requires: util-linux, coreutils + +%description +AcetoneISO: The CD/DVD image manipulator for Linux, it can do the following: +- Mount and Unmount ISO, MDF, NRG (if iso-9660 standard) +- Convert / Extract / Browse to ISO : *.bin *.mdf *.nrg *.img *.daa *.cdi + *.xbx *.b5i *.bwi *.pdi +- Play a DVD Movie ISO with most used media players +- Generate an ISO from a Folder or CD/DVD +- Generate MD5 file of an image +- Encrypt an image +- Split image into X megabyte chunks +- Highly compress an image +- Rip a PSX cd to *.bin to make it work with epsxe/psx emulators +- Service-Menu support for Konqueror +- Restore a lost CUE file of *.bin *.img + +%prep +%setup -q + +%build +cd src/ +chmod -x *.c +mkdir ../binaries +# xbiso is in its own package +for i in b5i2iso.c cdi2iso.c mdf2iso.c nrg2iso.c pdi2iso.c; do + SHORTNAME=`echo $i | sed 's/.c//'` + gcc $RPM_OPT_FLAGS $i -o ../binaries/$SHORTNAME +done + +%install +rm -rf $RPM_BUILD_ROOT +mkdir $RPM_BUILD_ROOT +mkdir -p $RPM_BUILD_ROOT%{_bindir} +install -p binaries/* $RPM_BUILD_ROOT%{_bindir} +mkdir -p $RPM_BUILD_ROOT%{_datadir}/apps/%{name}/scripts/ +sed -i 's|/opt/acetoneiso/|/usr/|g' %{name}-%{version}/AcetoneISO.kmdr +chmod -x %{name}-%{version}/AcetoneISO.kmdr +install -p %{name}-%{version}/AcetoneISO.kmdr $RPM_BUILD_ROOT%{_datadir}/apps/%{name}/scripts +mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps +install -p %{name}-%{version}/*.png $RPM_BUILD_ROOT%{_datadir}/pixmaps +mkdir -p $RPM_BUILD_ROOT%{_sbindir} +sed -i 's|/opt/acetoneiso/.|%{_sbindir}|g' %{name}-%{version}/acetoneiso-*mount.desktop +chmod -x %{name}-%{version}/acetoneiso-*mount.desktop +install -p %{name}-%{version}/*.sh $RPM_BUILD_ROOT%{_sbindir} + +sed -i 's|/opt/acetoneiso/|%{_datadir}/apps/%{name}/scripts/|g' %{name}-%{version}/acetoneiso +install -p %{name}-%{version}/acetoneiso $RPM_BUILD_ROOT%{_bindir} + +mkdir -p $RPM_BUILD_ROOT%{_datadir}/apps/konqueror/servicemenus/ +install -p %{name}-%{version}/acetoneiso-*mount.desktop $RPM_BUILD_ROOT%{_datadir}/apps/konqueror/servicemenus/ + +mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications +mv %{name}-%{version}/AcetoneISO %{name}-%{version}/AcetoneISO.desktop +sed -i 's|/opt/acetoneiso/|%{_datadir}/apps/%{name}/scripts/|g' %{name}-%{version}/AcetoneISO.desktop +sed -i "s|'/usr/share/apps/AcetoneISO/scripts/AcetoneISO.kmdr'|/usr/share/apps/AcetoneISO/scripts/AcetoneISO.kmdr|g" %{name}-%{version}/AcetoneISO.desktop +desktop-file-install --vendor "" \ + --dir $RPM_BUILD_ROOT%{_datadir}/applications \ + --add-category System \ + %{name}-%{version}/AcetoneISO.desktop + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root) +%doc GPL README changelog +%{_bindir}/acetoneiso +%{_bindir}/b5i2iso +%{_bindir}/cdi2iso +%{_bindir}/mdf2iso +%{_bindir}/nrg2iso +%{_bindir}/pdi2iso +%{_sbindir}/playiso-unmount.sh +%{_sbindir}/turbo.sh +%{_datadir}/applications/*.desktop +%{_datadir}/apps/%{name}/ +%{_datadir}/apps/konqueror/servicemenus/acetoneiso-*.desktop +%{_datadir}/pixmaps/*.png + +%changelog +* Thu Nov 8 2007 Tom "spot" Callaway - 6.7-2 +- fix unowned directories +- drop vendor in desktop file +- fix desktop file to actually work + +* Mon Jun 4 2007 Tom "spot" Callaway - 6.7-1 +- initial build for Fedora diff --git a/sources b/sources index e69de29..bb94b4e 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +f75b37764812539817459d02876701d2 AcetoneISO-6.7-clean.tar.gz From 50a1af1b41de51d7ff67132b4dd36853ef524d61 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Wed, 21 Nov 2007 18:03:18 +0000 Subject: [PATCH 3/6] Fix bz 394441, nrg2iso conflict --- AcetoneISO.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/AcetoneISO.spec b/AcetoneISO.spec index 72e94c6..cb996d3 100644 --- a/AcetoneISO.spec +++ b/AcetoneISO.spec @@ -1,6 +1,6 @@ Name: AcetoneISO Version: 6.7 -Release: 2%{?dist} +Release: 3%{?dist} Summary: CD/DVD Image Manipulator Group: Applications/Archiving License: GPL @@ -10,7 +10,7 @@ URL: http://www.acetoneteam.org/ Source0: %{name}-%{version}-clean.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: kdewebdev-devel, desktop-file-utils -Requires: p7zip, xbiso, k3b, kdebase, arts, cdrdao +Requires: p7zip, xbiso, k3b, kdebase, arts, cdrdao, nrg2iso # Overkill, but I'm being thorough Requires: util-linux, coreutils @@ -37,7 +37,8 @@ cd src/ chmod -x *.c mkdir ../binaries # xbiso is in its own package -for i in b5i2iso.c cdi2iso.c mdf2iso.c nrg2iso.c pdi2iso.c; do +# so is nrg2iso. +for i in b5i2iso.c cdi2iso.c mdf2iso.c pdi2iso.c; do SHORTNAME=`echo $i | sed 's/.c//'` gcc $RPM_OPT_FLAGS $i -o ../binaries/$SHORTNAME done @@ -83,7 +84,6 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/b5i2iso %{_bindir}/cdi2iso %{_bindir}/mdf2iso -%{_bindir}/nrg2iso %{_bindir}/pdi2iso %{_sbindir}/playiso-unmount.sh %{_sbindir}/turbo.sh @@ -93,6 +93,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/pixmaps/*.png %changelog +* Wed Nov 21 2007 Tom "spot" Callaway - 6.7-3 +- nrg2iso has its own package (bz 394441) + * Thu Nov 8 2007 Tom "spot" Callaway - 6.7-2 - fix unowned directories - drop vendor in desktop file From 1662c4056637e03a3ab7fe0f72fe8187165fe2d5 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Mon, 26 Nov 2007 15:28:35 +0000 Subject: [PATCH 4/6] Requires: kdewebdev --- AcetoneISO.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/AcetoneISO.spec b/AcetoneISO.spec index cb996d3..8bb2de0 100644 --- a/AcetoneISO.spec +++ b/AcetoneISO.spec @@ -1,6 +1,6 @@ Name: AcetoneISO Version: 6.7 -Release: 3%{?dist} +Release: 4%{?dist} Summary: CD/DVD Image Manipulator Group: Applications/Archiving License: GPL @@ -12,7 +12,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: kdewebdev-devel, desktop-file-utils Requires: p7zip, xbiso, k3b, kdebase, arts, cdrdao, nrg2iso # Overkill, but I'm being thorough -Requires: util-linux, coreutils +Requires: util-linux, coreutils, kdewebdev %description AcetoneISO: The CD/DVD image manipulator for Linux, it can do the following: @@ -93,6 +93,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/pixmaps/*.png %changelog +* Mon Nov 26 2007 Tom "spot" Callaway - 6.7-4 +- Requires: kdewebdev + * Wed Nov 21 2007 Tom "spot" Callaway - 6.7-3 - nrg2iso has its own package (bz 394441) From 2aba006f4dcdf6791f844aa64d850b19b02e1869 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 00:16:11 +0000 Subject: [PATCH 5/6] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 0f74d82..bb9bd27 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := AcetoneISO 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 +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 95c4836bde9098a9ec02a5a8c4449d6d9e812f53 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 08:45:38 +0000 Subject: [PATCH 6/6] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index bb9bd27..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: AcetoneISO -# $Id$ -NAME := AcetoneISO -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 $$d/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/Root && { 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) diff --git a/branch b/branch deleted file mode 100644 index e9e7ccd..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-8