rpms/k3b/FC-5 k3b-0.12.8-docsym.patch, NONE, 1.1 k3b.spec, 1.28, 1.29 sources, 1.12, 1.13
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu Jun 8 08:26:53 UTC 2006
Author: harald
Update of /cvs/dist/rpms/k3b/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv25565
Modified Files:
k3b.spec sources
Added Files:
k3b-0.12.8-docsym.patch
Log Message:
version 0.12.15
k3b-0.12.8-docsym.patch:
admin/am_edit | 2 +-
doc/Makefile.in | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE k3b-0.12.8-docsym.patch ---
--- k3b-0.12.8/doc/Makefile.in.docsym 2006-05-31 15:23:22.000000000 +0200
+++ k3b-0.12.8/doc/Makefile.in 2006-05-31 15:24:33.000000000 +0200
@@ -541,7 +541,7 @@
$(INSTALL_DATA) $(srcdir)/index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/k3b/; \
fi
-rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/k3b/common
- $(LN_S) $(kde_libs_htmldir)/$(KDE_LANG)/common $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/k3b/common
+ $(LN_S) ../$(KDE_LANG)/common $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/k3b/common
uninstall-docs:
-rm -rf $(kde_htmldir)/$(KDE_LANG)/k3b
--- k3b-0.12.8/admin/am_edit.docsym 2006-05-31 15:26:30.000000000 +0200
+++ k3b-0.12.8/admin/am_edit 2006-05-31 15:26:57.000000000 +0200
@@ -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) ../$kdelang/common \$(DESTDIR)\$(kde_htmldir)/$kdelang/$appname/common\n";
$lines .= "\n";
$lines .= "uninstall-docs:\n";
Index: k3b.spec
===================================================================
RCS file: /cvs/dist/rpms/k3b/FC-5/k3b.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- k3b.spec 21 Mar 2006 16:04:45 -0000 1.28
+++ k3b.spec 8 Jun 2006 08:26:50 -0000 1.29
@@ -2,8 +2,8 @@
%define i18n_version 0.12.10
Name: k3b
-Version: 0.12.14
-Release: 0.FC5.2
+Version: 0.12.15
+Release: 0.FC5.1
Epoch: 0
Summary: CD/DVD burning application for KDE
@@ -21,6 +21,8 @@
Patch7: k3b-0.11.17-dao.patch
Patch8: k3b-0.12.2-statfs.patch
Patch9: k3b-0.11.23-proxy.patch
+Patch10: k3b-0.12.14-norootwarning.patch
+Patch11: k3b-0.12.8-docsym.patch
Patch99: k3b-0.12.2-compile.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
@@ -59,6 +61,8 @@
#%patch7 -p1 -b .dao
%patch8 -p1 -b .statfs
#%patch9 -p1 -b .httpfix
+%patch10 -p1 -b .norootwarning
+%patch11 -p1 -b .docsym
%patch99 -p1 -b .docompile
pushd %{name}-i18n-%{i18n_version}
%patch99 -p1 -b .docompile
@@ -111,7 +115,13 @@
# GNOME desktop beautification (requires "Icon=name.png" fix in setup section).
mkdir $RPM_BUILD_ROOT%{_datadir}/pixmaps
-ln -s ../icons/crystalsvg/48x48/apps/k3b.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/k3b.png
+ln -s ../icons/hicolor/48x48/apps/k3b.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/k3b.png
+
+pushd $RPM_BUILD_ROOT%{_datadir}/doc/HTML
+for i in *; do
+ test -d $i && mkdir $i/common 2>/dev/null
+done
+popd
%find_lang %{name}
%find_lang k3bsetup
@@ -171,6 +181,9 @@
%changelog
+* Thu Jun 8 2006 Harald Hoyer <harald at redhat.com> - 0:0.12.15-0.FC5.1
+- version 0.12.15
+
* Tue Mar 21 2006 Harald Hoyer <harald at redhat.com> 0:0.12.14-0.FC5.2
- version 0.12.14
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/k3b/FC-5/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources 21 Mar 2006 16:04:45 -0000 1.12
+++ sources 8 Jun 2006 08:26:50 -0000 1.13
@@ -1,2 +1,2 @@
-51ef4fdf98365a285489dc1e11a07a3c k3b-0.12.14.tar.bz2
-db3bc6d94da5b63f22bd04e981486974 k3b-i18n-0.12.10.tar.bz2
+6cbfd080b3684efae0ed4b4797b5cecb k3b-i18n-0.12.15.tar.bz2
+246607f9d63b94c7f91ac86c108efdc2 k3b-0.12.15.tar.bz2
More information about the fedora-cvs-commits
mailing list