rpms/k3b/devel k3b-i18n-0.12.17-rellink.patch, NONE, 1.1 .cvsignore, 1.13, 1.14 k3b.spec, 1.37, 1.38 sources, 1.14, 1.15

Thu Feb 15 12:10:48 UTC 2007

Author: harald

Update of /cvs/dist/rpms/k3b/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15790

Modified Files:
	.cvsignore k3b.spec sources 
Added Files:
	k3b-i18n-0.12.17-rellink.patch 
Log Message:
- version k3b-1.0rc6


k3b-i18n-0.12.17-rellink.patch:
 am_edit |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE k3b-i18n-0.12.17-rellink.patch ---
--- k3b-1.0rc5/k3b-i18n-0.12.17/admin/am_edit.lns	2007-02-07 16:27:14.000000000 +0100
+++ k3b-1.0rc5/k3b-i18n-0.12.17/admin/am_edit	2007-02-07 16:35:36.000000000 +0100
@@ -2028,7 +2028,7 @@
       $lines .= "\t\$(INSTALL_DATA) \$(srcdir)/index.cache.bz2 \$(DESTDIR)\$(kde_htmldir)/$kdelang/$appname/; \\\n";
       $lines .= "\tfi\n";
       $lines .= "\t-rm -f \$(DESTDIR)\$(kde_htmldir)/$kdelang/$appname/common\n";
-      $lines .= "\t\$(LN_S) \$(kde_libs_htmldir)/$kdelang/common \$(DESTDIR)\$(kde_htmldir)/$kdelang/$appname/common\n";
+      $lines .= "\t\$(LN_S) ../common \$(DESTDIR)\$(kde_htmldir)/$kdelang/$appname/common\n";
 
       $lines .= "\n";
       $lines .= "uninstall-docs:\n";


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/k3b/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	23 Jan 2007 15:06:25 -0000	1.13
+++ .cvsignore	15 Feb 2007 12:10:46 -0000	1.14
@@ -1,3 +1,2 @@
-k3b-1.0pre2.tar.bz2
+k3b-1.0rc6.tar.bz2
 k3b-i18n-0.12.17.tar.bz2
-k3b-1.0rc4.tar.bz2


Index: k3b.spec
===================================================================
RCS file: /cvs/dist/rpms/k3b/devel/k3b.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- k3b.spec	14 Feb 2007 16:42:02 -0000	1.37
+++ k3b.spec	15 Feb 2007 12:10:46 -0000	1.38
@@ -1,9 +1,9 @@
-%define tar_version 1.0rc4
+%define tar_version 1.0rc6
 %define i18n_version 0.12.17
 
 Name: k3b
 Version: 1.0.0
-Release: 0.rc4.2
+Release: 0.rc6.1%{?dist}
 Epoch: 0
 Summary: CD/DVD burning application for KDE
 
@@ -14,7 +14,9 @@
 Source1: http://dl.sf.net/k3b/k3b-i18n-%{i18n_version}.tar.bz2
 Source2: k3brc
 
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+Patch1: k3b-i18n-0.12.17-rellink.patch
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ExcludeArch: s390 s390x
 
@@ -22,17 +24,16 @@
 BuildRequires: qt-devel >= 3.3.4
 BuildRequires: zlib-devel, libpng-devel, libjpeg-devel
 BuildRequires: libvorbis-devel, audiofile-devel, flac-devel
-BuildRequires: desktop-file-utils
+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
+BuildRequires: libidn-devel hal-devel libmusicbrainz-devel
+# Deps from Extras
+BuildRequires: taglib-devel dbus-qt-devel libsamplerate-devel
 
 Requires: cdrecord mkisofs dvd+rw-tools cdrdao
-Provides: %{name}-devel = %{epoch}:%{version}-%{release}
 Provides: %{name}-i18n = %{epoch}:%{version}-%{release}
 
-Prereq: /sbin/ldconfig
-
 %description
 K3b provides a comfortable user interface to perform most CD/DVD
 burning tasks. While the experienced user can take influence in all
@@ -40,9 +41,19 @@
 automatic settings and the reasonable k3b defaults which allow a quick
 start.
 
+%package devel
+Summary: Files for the development of applications which will use k3b
+Group: Development/Libraries
+Requires: %{name} = %{epoch}:%{version}-%{release}
+
+%description devel
+Files for the development of applications, which will use k3b.
+
 %prep
 %setup -q -a 1 -n %{name}-%{tar_version}
 
+%patch1 -p1 -b .lns
+
 # Make desktop icon file names compatible with GNOME.
 sed -i 's,^Icon=k3b$,Icon=k3b.png,' src/k3b.desktop k3bsetup/k3bsetup2.desktop
 
@@ -50,8 +61,8 @@
 unset QTDIR
 . /etc/profile.d/qt.sh
 export QTLIB=$QTDIR/lib
-aclocal
-autoconf
+#aclocal
+#autoconf
 %configure --with-k3bsetup=no --disable-rpath
 make %{?_smp_mflags}
 
@@ -86,12 +97,25 @@
 rm -rf $RPM_BUILD_ROOT%{_datadir}/applnk
 
 # remove the .la files
-rm -f $RPM_BUILD_ROOT%{_libdir}/libk3b*.la
+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
+
+rm -f $RPM_BUILD_ROOT%{_docdir}/HTML/en/k3b/common 
+ln -s ../common $RPM_BUILD_ROOT%{_docdir}/HTML/en/k3b/common
+
 pushd $RPM_BUILD_ROOT%{_datadir}/doc/HTML
 for i in *; do
 	test -d $i && mkdir $i/common 2>/dev/null
@@ -120,19 +144,10 @@
 %{_datadir}/applications/*.desktop
 
 %{_datadir}/mimelnk/application/x-k3b.desktop
-
-%{_includedir}/k3b*.h
-%{_includedir}/kcutlabel.h
-
 %{_libdir}/libk3b*.so.*
-%{_libdir}/libk3b*.so
 
-%{_libdir}/kde3/libk3b*.la
-%{_libdir}/kde3/libk3b*.so
-%{_libdir}/kde3/kfile_k3b.la
-%{_libdir}/kde3/kfile_k3b.so
-%{_libdir}/kde3/kio_videodvd.la
-%{_libdir}/kde3/kio_videodvd.so
+%{_libdir}/kde3/*.so
+%{_libdir}/kde3/*.la
 %{_datadir}/apps/konqsidebartng/virtual_folders/services/videodvd.desktop
 %{_datadir}/services/kfile_k3b.desktop
 %{_datadir}/services/videodvd.protocol
@@ -163,10 +178,20 @@
 %lang(uk) %doc %{_docdir}/HTML/uk/*
 %lang(pl) %doc %{_docdir}/HTML/pl/*
 
+# devel subpackage
+%files devel
+%defattr(-,root,root,755)
+%doc %{name}-i18n-%{i18n_version}/README 
+%doc %{name}-i18n-%{i18n_version}/COPYING 
+%{_includedir}/k3b
+%{_libdir}/libk3b*.so
 
 %changelog
-* Wed Feb 14 2007 Karsten Hopp <karsten at redhat.com> 1.0.0-0.rc4.2
-- rebuild with libFLAC.so.8
+* Thu Feb 15 2007 Harald Hoyer <harald at redhat.com> - 0:1.0.0-0.rc6.1
+- version k3b-1.0rc6
+
+* Wed Feb  7 2007 Harald Hoyer <harald at redhat.com> - 0:1.0.0-0.rc5.1
+- version k3b-1.0rc5
 
 * Wed Jan 17 2007 Harald Hoyer <harald at redhat.com> - 0:1.0.0-0.rc4.1
 - version k3b-1.0rc4


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/k3b/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	23 Jan 2007 15:06:25 -0000	1.14
+++ sources	15 Feb 2007 12:10:46 -0000	1.15
@@ -1,2 +1,2 @@
+4cc663fd6f135531b9384b90282ebfb4  k3b-1.0rc6.tar.bz2
 f9de0fb3ce91fa572f4f0fd24dcfe2f2  k3b-i18n-0.12.17.tar.bz2
-785e81fe3ee695d3b927cef9759a9753  k3b-1.0rc4.tar.bz2


