[meego-commits] 5423: Changes to Trunk:Testing/cdrkit
Anas Nashif
nashif at linux.intel.com
Thu Jul 8 13:38:39 UTC 2010
Hi,
I have made the following changes to cdrkit in project Trunk:Testing. Please review and accept ASAP.
Thank You,
Anas Nashif
[This message was auto-generated]
---
Request #5423:
submit: home:nashif:branches:Trunk:Testing/cdrkit(r6)(cleanup) -> Trunk:Testing/cdrkit
Message:
* Thu Jul 08 2010 Anas Nashif <anas.nashif at intel.com> - 1.1.10
- Use new cmake support in spectacle
- Remove bogus dependencies
State: new 2010-07-08T01:34:11 nashif
Comment: None
changes files:
--------------
--- cdrkit.changes
+++ cdrkit.changes
@@ -0,0 +1,4 @@
+* Thu Jul 08 2010 Anas Nashif <anas.nashif at intel.com> - 1.1.10
+- Use new cmake support in spectacle
+- Remove bogus dependencies
+
spec files:
-----------
--- cdrkit.spec
+++ cdrkit.spec
@@ -1,6 +1,6 @@
#
# Do not Edit! Generated by:
-# spectacle version 0.17
+# spectacle version 0.19~pre
#
# >> macros
# << macros
@@ -19,7 +19,12 @@
Patch2: cdrkit-1.1.9-no_mp3.patch
Patch3: cdrkit-1.1.9-buffer_overflow.patch
Patch4: cdrkit-1.1.10-build-fix.patch
-BuildRequires: cmake libcap-devel zlib-devel perl file-devel bzip2-devel
+BuildRequires: cmake
+BuildRequires: libcap-devel
+BuildRequires: zlib-devel
+BuildRequires: perl
+BuildRequires: file-devel
+BuildRequires: bzip2-devel
%description
@@ -29,15 +34,10 @@
%package -n genisoimage
Summary: Creates an image of an ISO9660 filesystem
Group: Applications/System
-Requires: %{name} = %{version}-%{release}
-Requires(preun): %{_sbindir}/alternatives
Requires(preun): chkconfig
Requires(preun): coreutils
-Requires(post): %{_sbindir}/alternatives
Requires(post): chkconfig
Requires(post): coreutils
-Provides: mkisofs = 9:2.01-12
-Obsoletes: mkisofs < 9:2.01-12
%description -n genisoimage
The genisoimage program is used as a pre-mastering program; i.e., it
@@ -54,17 +54,10 @@
%package -n wodim
Summary: A command line CD/DVD recording program
Group: Applications/Archiving
-Requires: %{name} = %{version}-%{release}
-Requires(preun): %{_sbindir}/alternatives
Requires(preun): chkconfig
Requires(preun): coreutils
-Requires(post): %{_sbindir}/alternatives
Requires(post): chkconfig
Requires(post): coreutils
-Provides: dvdrecord = 0:0.1.5.1
-Provides: cdrecord = 9:2.01-12
-Obsoletes: dvdrecord <= 0:0.1.5
-Obsoletes: cdrecord < 9:2.01-12
%description -n wodim
Wodim is an application for creating audio and data CDs. Wodim
@@ -75,16 +68,11 @@
%package -n icedax
Summary: A utility for sampling/copying .wav files from digital audio CDs
Group: Applications/Multimedia
-Requires: %{name} = %{version}-%{release}
Requires: vorbis-tools
-Requires(preun): %{_sbindir}/alternatives
Requires(preun): chkconfig
Requires(preun): coreutils
-Requires(post): %{_sbindir}/alternatives
Requires(post): chkconfig
Requires(post): coreutils
-Provides: cdda2wav = 9:2.01-12
-Obsoletes: cdda2wav < 9:2.01-12
%description -n icedax
Icedax is a sampling utility for CD-ROM drives that are capable of
@@ -97,8 +85,7 @@
%package -n dirsplit
Summary: Splits directory into multiple volumes with equal size
Group: Applications/System
-Requires: %{name} = %{version}-%{release}
-Requires: perl >= 4:5.8.1
+Requires: perl
Requires: genisoimage = %{version}-%{release}
%description -n dirsplit
@@ -130,14 +117,16 @@
%build
# >> build pre
-mkdir moblin
-cd moblin
export CFLAGS="$RPM_OPT_FLAGS -Wall -Werror -Wno-unused-function -Wno-unused-variable -fno-strict-aliasing"
export CXXFLAGS="$CFLAGS"
export FFLAGS="$CFLAGS"
-cmake .. -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} -DBUILD_SHARED_LIBS:BOOL=ON
# << build pre
+mkdir meego-build
+cd meego-build
+cmake .. \
+ -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
+ -DBUILD_SHARED_LIBS:BOOL=ON
make %{?jobs:-j%jobs}
@@ -146,8 +135,8 @@
%install
rm -rf %{buildroot}
# >> install pre
-cd moblin
# << install pre
+cd meego-build
%make_install
# >> install post
@@ -245,10 +234,6 @@
-#%files
-#%defattr(-,root,root,-)
-# >> files
-# << files
%files -n genisoimage
@@ -264,14 +249,14 @@
%{_bindir}/isovfy
%{_bindir}/pitchplay
%{_bindir}/readmult
-%{_mandir}/man5/genisoimagerc.*
-%{_mandir}/man1/genisoimage.*
-%{_mandir}/man1/isodebug.*
-%{_mandir}/man1/isodump.*
-%{_mandir}/man1/isoinfo.*
-%{_mandir}/man1/isovfy.*
-%{_mandir}/man1/pitchplay.*
-%{_mandir}/man1/readmult.*
+%doc %{_mandir}/man5/genisoimagerc.*
+%doc %{_mandir}/man1/genisoimage.*
+%doc %{_mandir}/man1/isodebug.*
+%doc %{_mandir}/man1/isodump.*
+%doc %{_mandir}/man1/isoinfo.*
+%doc %{_mandir}/man1/isovfy.*
+%doc %{_mandir}/man1/pitchplay.*
+%doc %{_mandir}/man1/readmult.*
# << files genisoimage
%files -n wodim
@@ -285,10 +270,10 @@
%ghost %{_bindir}/dvdrecord
%{_bindir}/readom
%{_sbindir}/netscsid
-%{_mandir}/man1/devdump.*
-%{_mandir}/man1/wodim.*
-%{_mandir}/man1/netscsid.*
-%{_mandir}/man1/readom.*
+%doc %{_mandir}/man1/devdump.*
+%doc %{_mandir}/man1/wodim.*
+%doc %{_mandir}/man1/netscsid.*
+%doc %{_mandir}/man1/readom.*
# << files wodim
%files -n icedax
@@ -298,15 +283,15 @@
%{_bindir}/icedax
%ghost %{_bindir}/cdda2wav
%{_bindir}/cdda2ogg
-%{_mandir}/man1/icedax.*
-%{_mandir}/man1/cdda2ogg.*
-%{_mandir}/man1/list_audio_tracks.*
+%doc %{_mandir}/man1/icedax.*
+%doc %{_mandir}/man1/cdda2ogg.*
+%doc %{_mandir}/man1/list_audio_tracks.*
# << files icedax
%files -n dirsplit
%defattr(-,root,root,-)
# >> files dirsplit
%{_bindir}/dirsplit
-%{_mandir}/man1/dirsplit.*
+%doc %{_mandir}/man1/dirsplit.*
# << files dirsplit
other changes:
--------------
++++++ cdrkit.yaml
--- cdrkit.yaml
+++ cdrkit.yaml
@@ -16,9 +16,18 @@
Description: cdrkit is a collection of CD/DVD utilities.
PkgBR:
- - cmake libcap-devel zlib-devel perl file-devel bzip2-devel
-Configure: none
-Builder: make
+ - cmake
+ - libcap-devel
+ - zlib-devel
+ - perl
+ - file-devel
+ - bzip2-devel
+Configure: cmake
+ConfigOptions:
+ - -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix}
+ - -DBUILD_SHARED_LIBS:BOOL=ON
+Builder: cmake
+NoFiles: yes
SubPackages:
- Name: genisoimage
AsWholeName: yes
@@ -35,17 +44,11 @@
Install the genisoimage package if you need a program for writing
CD-ROMs.
RequiresPreUn:
- - "%{_sbindir}/alternatives"
- chkconfig
- coreutils
RequiresPost:
- - "%{_sbindir}/alternatives"
- chkconfig
- coreutils
- Provides:
- - mkisofs = 9:2.01-12
- Obsoletes:
- - mkisofs < 9:2.01-12
- Name: wodim
AsWholeName: yes
@@ -56,19 +59,11 @@
works with many different brands of CD recorders, fully supports
multi-sessions and provides human-readable error messages.
RequiresPreUn:
- - "%{_sbindir}/alternatives"
- chkconfig
- coreutils
RequiresPost:
- - "%{_sbindir}/alternatives"
- chkconfig
- coreutils
- Provides:
- - dvdrecord = 0:0.1.5.1
- - cdrecord = 9:2.01-12
- Obsoletes:
- - dvdrecord <= 0:0.1.5
- - cdrecord < 9:2.01-12
- Name: icedax
AsWholeName: yes
@@ -83,17 +78,11 @@
Requires:
- vorbis-tools
RequiresPreUn:
- - "%{_sbindir}/alternatives"
- chkconfig
- coreutils
RequiresPost:
- - "%{_sbindir}/alternatives"
- chkconfig
- coreutils
- Provides:
- - cdda2wav = 9:2.01-12
- Obsoletes:
- - cdda2wav < 9:2.01-12
- Name: dirsplit
AsWholeName: yes
@@ -106,6 +95,6 @@
for the optimal order to get the best space/medium-
number efficiency.
Requires:
- - perl >= 4:5.8.1
+ - perl
- genisoimage = %{version}-%{release}
More information about the MeeGo-commits
mailing list