Wed May 30 15:02:56 UTC 2007

Author: rdieter

Update of /cvs/pkgs/rpms/k3b/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31323

Modified Files:
	.cvsignore k3b.spec sources 
Removed Files:
	k3b-0.11.14-rdrw.patch k3b-0.11.14-suid.patch 
	k3b-0.11.14-version.patch k3b-0.11.17-dao.patch 
	k3b-0.11.23-proxy.patch k3b-0.11.23-statfs.patch 
	k3b-0.11.3-kde32.patch k3b-0.11.6-desktopfile.patch 
	k3b-0.12.14-norootwarning.patch k3b-0.12.2-compile.patch 
	k3b-0.12.2-statfs.patch k3b-0.12.8-docsym.patch k3b-scsi.patch 
Log Message:
* Wed May 30 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 0:1.0.1-1
- k3b-1.0.1
- include icon/mime scriptlets
- cleanup/simplify BR's
- optimize %configure
- restore applnk/.hidden bits



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/k3b/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16

--- .cvsignore	11 Apr 2007 12:24:40 -0000	1.15
+++ .cvsignore	30 May 2007 15:02:18 -0000	1.16
@@ -1,2 +1,4 @@
 k3b-1.0.tar.bz2
 k3b-i18n-1.0.tar.bz2
+k3b-1.0.1.tar.bz2
+k3b-i18n-1.0.1.tar.bz2


Index: k3b.spec
===================================================================
RCS file: /cvs/pkgs/rpms/k3b/devel/k3b.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- k3b.spec	11 Apr 2007 12:24:40 -0000	1.40
+++ k3b.spec	30 May 2007 15:02:18 -0000	1.41
@@ -1,15 +1,20 @@
-%define tar_version 1.0
-%define i18n_version 1.0
+%define tar_version 1.0.1
+%define i18n_version 1.0.1
 
-Name: k3b
-Version: 1.0
-Release: 1%{?dist}
-Epoch: 0
+## distro/release specific support
+%if 0%{?fedora} > 4 || 0%{?rhel} > 4
+%define _with_hal --with-hal
+%endif
+
+Name:    k3b
 Summary: CD/DVD burning application for KDE
+Epoch:   0
+Version: 1.0.1
+Release: 1%{?dist}
 
-Group: Applications/Archiving
+Group:   Applications/Archiving
 License: GPL
-URL: http://www.k3b.org
+URL:     http://www.k3b.org
 Source0: http://dl.sf.net/k3b/k3b-%{tar_version}.tar.bz2
 Source1: http://dl.sf.net/k3b/k3b-i18n-%{i18n_version}.tar.bz2
 Source2: k3brc
@@ -20,21 +25,35 @@
 
 ExcludeArch: s390 s390x
 
-BuildRequires: kdelibs-devel >= 6:3.4, libart_lgpl-devel, arts-devel
-BuildRequires: qt-devel >= 3.3.4
-BuildRequires: zlib-devel, libpng-devel, libjpeg-devel
-BuildRequires: libvorbis-devel, audiofile-devel, flac-devel
-BuildRequires: desktop-file-utils symlinks
-BuildRequires: autoconf, gettext, automake, intltool
-BuildRequires: libmng-devel fam-devel glib2-devel alsa-lib-devel esound-devel
-BuildRequires: libidn-devel hal-devel libmusicbrainz-devel
-# Deps from Extras
-#uildRequires: taglib-devel dbus-qt-devel libsamplerate-devel
-
-Requires: cdrecord mkisofs dvd+rw-tools cdrdao
+BuildRequires: kdelibs-devel 
+BuildRequires: desktop-file-utils
+BuildRequires: automake
+BuildRequires: alsa-lib-devel
+BuildRequires: audiofile-devel
+%{?_with_hal:BuildRequires: dbus-qt-devel hal-devel}
+BuildRequires: flac-devel
+BuildRequires: gettext
+BuildRequires: libdvdread-devel
+BuildRequires: libmpcdec-devel
+BuildRequires: libmusicbrainz-devel
+BuildRequires: libsamplerate-devel
+BuildRequires: libsndfile-devel
+BuildRequires: libvorbis-devel
+BuildRequires: taglib-devel
+BuildRequires: zlib-devel
+
+Obsoletes: k3b-extras < %{epoch}:%{version}-%{release}
+Provides:  k3b-extras = %{epoch}:%{version}-%{release} 
+# 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}
-Obsoletes: k3b-extras <= 0:0.12.17-1.fc6
-Provides: k3b-extras = 0:0.12.17-2
+
+Requires: cdrecord mkisofs
+%if 0%{?fedora} > 3
+Requires(hint): cdrdao
+Requires(hint): dvd+rw-tools
+%endif
 
 %description
 K3b provides a comfortable user interface to perform most CD/DVD
@@ -51,31 +70,46 @@
 %description devel
 Files for the development of applications, which will use k3b.
 
+
 %prep
 %setup -q -a 1 -n %{name}-%{tar_version}
+
 pushd %{name}-i18n-%{i18n_version}
 %patch1 -p2 -b .lns
+#aclocal
+#autoconf
+make -f admin/Makefile.common
 popd
-# Make desktop icon file names compatible with GNOME.
-sed -i 's,^Icon=k3b$,Icon=k3b.png,' src/k3b.desktop k3bsetup/k3bsetup2.desktop
+
 
 %build
-unset QTDIR
-. /etc/profile.d/qt.sh
-export QTLIB=$QTDIR/lib
-#aclocal
-#autoconf
-%configure --with-k3bsetup=no --disable-rpath
+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 \
+  --with-oggvorbis \
+  --with-flac \
+  --with-external-libsamplerate \
+  --with-musicbrainz \
+  --with-sndfile \
+  --without-ffmpeg --without-lame --without-libmad \
+  --with-musepack \
+  %{?_with_hal} %{!?_with_hal:--without-hal} 
+
 make %{?_smp_mflags}
 
 # Build for i18n tarball
 pushd %{name}-i18n-%{i18n_version}
-aclocal
-autoconf
 %configure
 make %{?_smp_mflags}
 popd
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
@@ -85,33 +119,17 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 popd
 
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/config
-%{__install} -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/config/k3brc
+%{__install} -D -m 644 -p %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/config/k3brc
 
-
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-desktop-file-install --vendor kde --delete-original \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+# what's X-Red-Hat-Base for?  -- Rex
+desktop-file-install --vendor="" \
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \
   --add-category X-Red-Hat-Base \
   $RPM_BUILD_ROOT%{_datadir}/applications/kde/%{name}.desktop
 
-# Empty directories.
-rm -rf $RPM_BUILD_ROOT%{_datadir}/applnk
-
 # remove the .la files
 rm -f $RPM_BUILD_ROOT%{_libdir}/libk3b*.la 
 
-# Test, if k3b works before removing these plugin .la files
-# rm -f $RPM_BUILD_ROOT%{_libdir}/kde3/*.la
-
-# move include files to a subdir
-mkdir -p $RPM_BUILD_ROOT%{_includedir}/k3b
-mv $RPM_BUILD_ROOT%{_includedir}/*.h $RPM_BUILD_ROOT%{_includedir}/k3b 2>/dev/null
-
-# GNOME desktop beautification (requires "Icon=name.png" fix in setup section).
-mkdir $RPM_BUILD_ROOT%{_datadir}/pixmaps
-ln -s ../icons/hicolor/48x48/apps/k3b.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/k3b.png
-
 # remove i18n for Plattdeutsch (Low Saxon)
 rm -fr $RPM_BUILD_ROOT%{_datadir}/locale/nds
 
@@ -124,26 +142,38 @@
 done
 popd
 
-%find_lang %{name}
+%find_lang %{name} 
 %find_lang k3bsetup
 %find_lang libk3b
 %find_lang libk3bdevice
 
 cat k3bsetup.lang libk3b.lang libk3bdevice.lang >> %{name}.lang
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
-%post -p /sbin/ldconfig
+%post
+/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 ||:
+
+%postun
+/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 ||:
 
-%postun -p /sbin/ldconfig
 
 %files -f %{name}.lang
 %defattr(-,root,root,755)
-%doc AUTHORS README COPYING TODO INSTALL ChangeLog
-%{_bindir}/%{name}
-%{_datadir}/applications/*.desktop
+%doc AUTHORS README COPYING TODO ChangeLog
+%{_bindir}/k3b
+%{_datadir}/applications/kde/%{name}.desktop
+# FIXME/TODO: move under %_datadir/applications, add Hidden=True attribute.
+%{_datadir}/applnk/.hidden/*.desktop
 
 %{_datadir}/mimelnk/application/x-k3b.desktop
 %{_libdir}/libk3b*.so.*
@@ -154,14 +184,11 @@
 %{_datadir}/services/kfile_k3b.desktop
 %{_datadir}/services/videodvd.protocol
 
-
-%{_datadir}/apps/k3b
+%{_datadir}/apps/k3b/
 %{_datadir}/apps/konqueror/servicemenus/*
 %{_datadir}/config/*
-%{_datadir}/pixmaps/%{name}.png
 %{_datadir}/sounds/*
-%dir %{_datadir}/icons/hicolor/*/apps
-%{_datadir}/icons/hicolor/*/apps/*.png
+%{_datadir}/icons/hicolor/*/*/*
 %doc %{_docdir}/HTML/en/*
 
 # files from i18n
@@ -185,10 +212,18 @@
 %defattr(-,root,root,755)
 %doc %{name}-i18n-%{i18n_version}/README 
 %doc %{name}-i18n-%{i18n_version}/COPYING 
-%{_includedir}/k3b
+%{_includedir}/k3b/
 %{_libdir}/libk3b*.so
 
+
 %changelog
+* Wed May 30 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 0:1.0.1-1
+- k3b-1.0.1
+- include icon/mime scriptlets
+- cleanup/simplify BR's
+- optimize %%configure
+- restore applnk/.hidden bits
+
 * Wed Apr 11 2007 Harald Hoyer <harald at redhat.com> - 0:1.0-1
 - version k3b-1.0
 - provide/obsolete k3b-extras


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/k3b/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	11 Apr 2007 12:24:40 -0000	1.16
+++ sources	30 May 2007 15:02:18 -0000	1.17
@@ -1,2 +1,2 @@
-02bf955059adfe9ac8a11d36fb34a11c  k3b-1.0.tar.bz2
-19534f984a9846b50bf027d1a9ce4988  k3b-i18n-1.0.tar.bz2
+8abd11f56e6e40d6f2d0b076a5f8b8ed  k3b-1.0.1.tar.bz2
+f87a27408a4153d860103816ba83db09  k3b-i18n-1.0.1.tar.bz2


--- k3b-0.11.14-rdrw.patch DELETED ---


--- k3b-0.11.14-suid.patch DELETED ---


--- k3b-0.11.14-version.patch DELETED ---


--- k3b-0.11.17-dao.patch DELETED ---


--- k3b-0.11.23-proxy.patch DELETED ---


--- k3b-0.11.23-statfs.patch DELETED ---


--- k3b-0.11.3-kde32.patch DELETED ---


--- k3b-0.11.6-desktopfile.patch DELETED ---


--- k3b-0.12.14-norootwarning.patch DELETED ---


--- k3b-0.12.2-compile.patch DELETED ---


--- k3b-0.12.2-statfs.patch DELETED ---


--- k3b-0.12.8-docsym.patch DELETED ---


--- k3b-scsi.patch DELETED ---


