rpms/k3b/devel .cvsignore, 1.20, 1.21 k3b.spec, 1.68, 1.69 sources, 1.21, 1.22 k3b-1.0.3-umount.patch, 1.2, NONE k3b-1.0.4-kde#151816.patch, 1.1, NONE k3b-1.0.4-manualbufsize.patch, 1.1, NONE k3b-1.0.5-hidden.patch, 1.3, NONE k3b-1.0.5-kde#156684.patch, 1.1, NONE k3brc, 1.2, NONE
Rex Dieter
rdieter at fedoraproject.org
Wed Apr 22 14:44:40 UTC 2009
Author: rdieter
Update of /cvs/pkgs/rpms/k3b/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27866
Modified Files:
.cvsignore k3b.spec sources
Removed Files:
k3b-1.0.3-umount.patch k3b-1.0.4-kde#151816.patch
k3b-1.0.4-manualbufsize.patch k3b-1.0.5-hidden.patch
k3b-1.0.5-kde#156684.patch k3brc
Log Message:
* Wed Apr 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 0:1.65.0-1
- k3b-1.65.0 (alpha1)
- optimize scriptlets
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/k3b/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore 27 May 2008 12:42:47 -0000 1.20
+++ .cvsignore 22 Apr 2009 14:44:36 -0000 1.21
@@ -1,2 +1 @@
-k3b-1.0.5.tar.bz2
-k3b-i18n-1.0.5.tar.bz2
+k3b-1.65.0alpha1.tar.bz2
Index: k3b.spec
===================================================================
RCS file: /cvs/pkgs/rpms/k3b/devel/k3b.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- k3b.spec 25 Feb 2009 10:02:34 -0000 1.68
+++ k3b.spec 22 Apr 2009 14:44:37 -0000 1.69
@@ -1,104 +1,43 @@
-## distro/release specific support
-%if 0%{?fedora} > 4 || 0%{?rhel} > 4
-%define _with_hal --with-hal
-%endif
-
-%if 0%{?fedora} > 6
-%define kdelibs3 kdelibs3
-%else
-%define kdelibs3 kdelibs
-BuildRequires: libutempter-devel
-%endif
-
-# include -devel subpkg or not? 1=yes
-%define devel 1
-
-
-%if 0%{?fedora} > 9
-# -libs subpkg
-%define libs 1
-%endif
-
-# build/include i18n
-%define i18n 1
+%define pre alpha1
Name: k3b
Summary: CD/DVD burning application
Epoch: 0
-Version: 1.0.5
-Release: 8%{?dist}
+Version: 1.65.0
+Release: 1%{?dist}
Group: Applications/Archiving
License: GPLv2+
-URL: http://www.k3b.org
-Source0: http://downloads.sf.net/k3b/k3b-%{version}.tar.bz2
-%{?i18n:Source1: http://downloads.sf.net/k3b/k3b-i18n-%{version}.tar.bz2}
+URL: http://www.k3b.org/
+Source0: http://downloads.sourceforge.net/sourceforge/k3b/k3b-%{version}%{pre}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# TODO: bugzilla/document
ExcludeArch: s390 s390x
-Source2: k3brc
-
-Patch2: k3b-1.0.3-umount.patch
-# manual bufsize (upstream?)
-Patch4: k3b-1.0.4-manualbufsize.patch
-
-# upstream patches
-# http://bugs.kde.org/151816 , k3b can't reload media for verification
-Patch100: k3b-1.0.4-kde#151816.patch
-# http://bugs.kde.org/156684 , alternative to patch100
-Patch101: k3b-1.0.5-kde#156684.patch
-# put k3b-(iso,cue).desktop to xdg_apps_DATA , see http://bugzilla.redhat.com/419681
-# upstreamed 2008-08-27
-Patch105: k3b-1.0.5-hidden.patch
+# FIXME/TODO: review configs/patches from k3b-1.0.x, to see if any are still applicable here
-BuildRequires: %{kdelibs3}-devel
+BuildRequires: cmake
BuildRequires: desktop-file-utils
-BuildRequires: alsa-lib-devel
-BuildRequires: audiofile-devel
-%{?_with_hal:BuildRequires: dbus-qt-devel hal-devel}
BuildRequires: flac-devel
BuildRequires: gettext
+BuildRequires: kdelibs4-devel
+BuildRequires: kdemultimedia-devel
BuildRequires: libdvdread-devel
BuildRequires: libmpcdec-devel
BuildRequires: libmusicbrainz-devel
BuildRequires: libsamplerate-devel
BuildRequires: libsndfile-devel
BuildRequires: libvorbis-devel
+# needed by k3bsetup
+#BuildRequires: polkit-qt-devel
BuildRequires: taglib-devel
-BuildRequires: zlib-devel
-
-Obsoletes: k3b-extras < %{epoch}:%{version}-%{release}
-Provides: k3b-extras = %{epoch}:%{version}-%{release}
-%if 0%{?i18n}
-# imo, should be packaged separately, tis a shame to duplicate all
-# this noarch build/data on *every* arch. -- Rex
-Obsoletes: %{name}-i18n < %{epoch}:%{version}-%{release}
-Provides: %{name}-i18n = %{epoch}:%{version}-%{release}
-%endif
-%if ! 0%{?devel}
-Obsoletes: %{name}-devel < %{epoch}:%{version}-%{release}
-%endif
-
-Requires(post): coreutils
-Requires(postun): coreutils
-%if 0%{?libs}
Requires: %{name}-libs = %{epoch}:%{version}-%{release}
-%else
-#Obsoletes: %{name}-libs < %{epoch}:%{version}-%{release}
-Provides: %{name}-libs = %{epoch}:%{version}-%{release}
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
-%endif
Requires: cdrecord mkisofs
-%if 0%{?fedora} > 3
Requires(hint): cdrdao
Requires(hint): dvd+rw-tools
-#Requires(hint): gnome-mount
-%endif
%description
K3b provides a comfortable user interface to perform most CD/DVD
@@ -110,7 +49,6 @@
%package libs
Summary: Runtime libraries for %{name}
Group: System Environment/Libraries
-# be paranoid -- Rex
Requires: %{name} = %{epoch}:%{version}-%{release}
%description libs
%{summary}.
@@ -124,161 +62,80 @@
%prep
-%setup -q %{?i18n:-a 1} -n %{name}-%{version}
-
-%patch2 -p1 -b .umount
-# set in k3brc too
-%patch4 -p1 -b .manualbufsize
-
-#patch100 -p1 -b .kde#151816
-%patch101 -p1 -b .kde#156684
-%patch105 -p1 -b .hidden
+%setup -q -n %{name}-%{version}
%build
-unset QTDIR || : ; . /etc/profile.d/qt.sh
-%configure \
- --includedir=%{_includedir}/k3b \
- --disable-rpath \
- --enable-new-ldflags \
- --disable-debug --disable-warnings \
- --disable-dependency-tracking --enable-final \
- --with-k3bsetup=no \
- --without-cdrecord-suid-root \
- --with-oggvorbis \
- --with-flac \
- --with-external-libsamplerate \
- --with-libdvdread \
- --with-musicbrainz \
- --with-sndfile \
- --without-ffmpeg --without-lame --without-libmad \
- --with-musepack \
- %{?_with_hal} %{!?_with_hal:--without-hal}
-
-make %{?_smp_mflags}
-
-%if 0%{?i18n}
-# Build for i18n tarball
-pushd %{name}-i18n-%{version}
-%configure
-make %{?_smp_mflags}
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%{cmake_kde4} \
+ -DK3B_BUILD_K3BSETUP=OFF \
+ ..
popd
-%endif
+
+make %{?_smp_mflags} -C %{_target_platform}
%install
rm -rf %{buildroot}
-make install DESTDIR=%{buildroot}
-
-%if 0%{?i18n}
-# Install for i18n tarball
-pushd %{name}-i18n-%{version}
-make install DESTDIR=%{buildroot}
-popd
-%endif
-
-%{__install} -D -m 644 -p %{SOURCE2} %{buildroot}%{_datadir}/config/k3brc
-
-desktop-file-install --vendor="" \
- --dir %{buildroot}%{_datadir}/applications/kde \
- %{buildroot}%{_datadir}/applications/kde/*.desktop
-
-# remove the .la files
-rm -f %{buildroot}%{_libdir}/libk3b*.la
-
-# remove i18n for Plattdeutsch (Low Saxon)
-rm -fr %{buildroot}%{_datadir}/locale/nds
-
-# HTML (1.0)
-HTML_DIR=$(kde-config --expandvars --install html)
-if [ -d %{buildroot}$HTML_DIR ]; then
-for lang_dir in %{buildroot}$HTML_DIR/* ; do
- if [ -d $lang_dir ]; then
- lang=$(basename $lang_dir)
- echo "%lang($lang) $HTML_DIR/$lang/*" >> all.lang
- # replace absolute symlinks with relative ones
- pushd $lang_dir
- for i in *; do
- [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
- done
- popd
- fi
-done
-fi
-
-%if 0%{?i18n}
-%find_lang k3b
-%find_lang k3bsetup
-%find_lang libk3b
-%find_lang libk3bdevice
-cat k3b.lang k3bsetup.lang libk3b.lang libk3bdevice.lang >> all.lang
-%endif
-
-# unpackaged files
-%if ! 0%{?devel}
-rm -rf %{buildroot}%{_includedir}/k3b/
-rm -f %{buildroot}%{_libdir}/libk3b*.so
-%endif
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
%clean
rm -rf %{buildroot}
-%if 0%{?libs}
%post libs -p /sbin/ldconfig
%postun libs -p /sbin/ldconfig
-%endif
%post
-%{?!libs:/sbin/ldconfig}
-touch --no-create %{_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 ||:
+touch --no-create %{_kde4_iconsdir}/hicolor ||:
+
+%posttrans
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+update-desktop-database -q &> /dev/null ||:
%postun
-%{?!libs:/sbin/ldconfig}
-touch --no-create %{_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 ||:
+if [ $1 -eq 0 ] ; then
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+update-desktop-database -q &> /dev/null ||:
+fi
-%files -f all.lang
-%defattr(-,root,root,755)
+%files
+%defattr(-,root,root,-)
%doc AUTHORS README COPYING TODO ChangeLog
-%{_bindir}/k3b
-%{_datadir}/applications/kde/*.desktop
-%{_datadir}/mimelnk/application/x-k3b.desktop
-
-%{_libdir}/kde3/*.so
-%{_libdir}/kde3/*.la
-%{_datadir}/apps/konqsidebartng/virtual_folders/services/videodvd.desktop
-%{_datadir}/services/kfile_k3b.desktop
-%{_datadir}/services/videodvd.protocol
-
-%{_datadir}/apps/k3b/
-%{_datadir}/apps/konqueror/servicemenus/*
-%{_datadir}/config/*
-%{_datadir}/sounds/*
-%{_datadir}/icons/hicolor/*/*/*
+%{_kde4_bindir}/k3b
+%{_kde4_appsdir}/k3b/
+%{_kde4_appsdir}/konqsidebartng/konqsidebartng/virtual_folders/services/*.desktop
+%{_kde4_appsdir}/solid/actions/*.desktop
+%{_kde4_datadir}/applications/kde4/k3b*.desktop
+%{_kde4_datadir}/kde4/services/*.desktop
+%{_kde4_datadir}/kde4/services/*.protocol
+%{_kde4_datadir}/kde4/services/ServiceMenus/k3b*.desktop
+%{_kde4_datadir}/kde4/servicetypes/k3b*.desktop
+%{_kde4_datadir}/sounds/k3b_*
+%{_kde4_iconsdir}/hicolor/*/*/*
+%{_kde4_libdir}/kde4/*.so
-%if 0%{?libs}
%files libs
%defattr(-,root,root,-)
-%endif
-%{_libdir}/libk3b*.so.*
+%{_kde4_libdir}/libk3b*.so.*
-%if 0%{?devel}
%files devel
%defattr(-,root,root,-)
-%{_includedir}/k3b/
-%{_libdir}/libk3b*.so
-%endif
+%{_kde4_includedir}/k3b*
+%{_kde4_libdir}/libk3b*.so
%changelog
+* Wed Apr 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 0:1.65.0-1
+- k3b-1.65.0 (alpha1)
+- optimize scriptlets
+
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.0.5-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/k3b/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources 27 May 2008 12:42:47 -0000 1.21
+++ sources 22 Apr 2009 14:44:37 -0000 1.22
@@ -1,2 +1 @@
-e3b37d0d009af3dd149215d6ae0d54f3 k3b-1.0.5.tar.bz2
-610b1fd9356c89cbb38b6dda1f115c86 k3b-i18n-1.0.5.tar.bz2
+1573fcf064fee3d9848a63ceefa5cf41 k3b-1.65.0alpha1.tar.bz2
--- k3b-1.0.3-umount.patch DELETED ---
--- k3b-1.0.4-kde#151816.patch DELETED ---
--- k3b-1.0.4-manualbufsize.patch DELETED ---
--- k3b-1.0.5-hidden.patch DELETED ---
--- k3b-1.0.5-kde#156684.patch DELETED ---
--- k3brc DELETED ---
More information about the fedora-extras-commits
mailing list