rpms/k3b/devel k3b-1.0.5-hidden.patch,NONE,1.1 k3b.spec,1.61,1.62
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Mon Jun 30 15:09:42 UTC 2008
Author: rdieter
Update of /cvs/pkgs/rpms/k3b/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3842
Modified Files:
k3b.spec
Added Files:
k3b-1.0.5-hidden.patch
Log Message:
* Mon Jun 30 2008 Rex Dieter <rdieter at fedoraproject.org> - 0:1.0.5-3
- No association k3b with .iso files in gnome (#419681)
- scriptlet deps
- cleanup doc/HTML
k3b-1.0.5-hidden.patch:
--- NEW FILE k3b-1.0.5-hidden.patch ---
diff -up k3b-1.0.5/src/Makefile.in.hidden k3b-1.0.5/src/Makefile.in
--- k3b-1.0.5/src/Makefile.in.hidden 2008-05-27 03:34:44.000000000 -0500
+++ k3b-1.0.5/src/Makefile.in 2008-06-30 09:30:46.000000000 -0500
@@ -512,9 +512,7 @@ k3b_LDADD = ./option/liboption.la ./rip/
-lkio -lkparts $(CAM_LIB) $(MUSICBRAINZ_LIBS)
SUBDIRS = option misc rip projects fastscale pics icons konqi mimetypes sounds
-xdg_apps_DATA = k3b.desktop
-silent_DATA = k3b-iso.desktop k3b-cue.desktop
-silentdir = $(kde_appsdir)/.hidden/
+xdg_apps_DATA = k3b.desktop k3b-iso.desktop k3b-cue.desktop
###################
# this 10 paths are KDE specific. Use them:
diff -up k3b-1.0.5/src/Makefile.am.hidden k3b-1.0.5/src/Makefile.am
--- k3b-1.0.5/src/Makefile.am.hidden 2008-05-27 03:24:04.000000000 -0500
+++ k3b-1.0.5/src/Makefile.am 2008-06-30 09:29:58.000000000 -0500
@@ -32,10 +32,7 @@ k3b_LDADD = ./option/liboption.la ./rip/
SUBDIRS = option misc rip projects fastscale pics icons konqi mimetypes sounds
-xdg_apps_DATA = k3b.desktop
-
-silent_DATA = k3b-iso.desktop k3b-cue.desktop
-silentdir = $(kde_appsdir)/.hidden/
+xdg_apps_DATA = k3b.desktop k3b-iso.desktop k3b-cue.desktop
###################
# this 10 paths are KDE specific. Use them:
Index: k3b.spec
===================================================================
RCS file: /cvs/pkgs/rpms/k3b/devel/k3b.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- k3b.spec 1 Jun 2008 01:12:15 -0000 1.61
+++ k3b.spec 30 Jun 2008 15:08:37 -0000 1.62
@@ -14,7 +14,7 @@
Summary: CD/DVD burning application for KDE
Epoch: 0
Version: 1.0.5
-Release: 2%{?dist}
+Release: 3%{?dist}
Group: Applications/Archiving
License: GPLv2+
@@ -32,6 +32,8 @@
# http://bugs.kde.org/151816 , k3b can't reload media for verification
Patch3: k3b-1.0.4-kde#151816.patch
Patch4: k3b-1.0.4-manualbufsize.patch
+# put k3b-(iso,cue).desktop to xdg_apps_DATA , see http://bugzilla.redhat.com/419681
+Patch5: k3b-1.0.5-hidden.patch
BuildRequires: kdelibs3-devel
BuildRequires: desktop-file-utils
@@ -61,6 +63,8 @@
Obsoletes: %{name}-devel < %{epoch}:%{version}-%{release}
%endif
+Requires(post): /sbin/ldconfig coreutils
+Requires(postun): /sbin/ldconfig coreutils
Requires: cdrecord mkisofs
%if 0%{?fedora} > 3
Requires(hint): cdrdao
@@ -94,6 +98,7 @@
%patch3 -p1 -b .kde#151816
# set in k3brc instead
#patch4 -p1 -b .manualbufsize
+%patch5 -p1 -b .hidden
pushd %{name}-i18n-%{version}
%patch1 -p2 -b .lns
@@ -160,12 +165,12 @@
done
popd
-%find_lang %{name}
+%find_lang k3b
%find_lang k3bsetup
%find_lang libk3b
%find_lang libk3bdevice
-cat k3bsetup.lang libk3b.lang libk3bdevice.lang >> %{name}.lang
+cat k3b.lang k3bsetup.lang libk3b.lang libk3bdevice.lang >> all.lang
# unpackaged files
%if ! 0%{?devel}
@@ -191,12 +196,11 @@
update-desktop-database %{_datadir}/applications > /dev/null 2>&1 ||:
-%files -f %{name}.lang
+%files -f all.lang
%defattr(-,root,root,755)
%doc AUTHORS README COPYING TODO ChangeLog
%{_bindir}/k3b
%{_datadir}/applications/kde/*.desktop
-%{_datadir}/applnk/.hidden/*.desktop
%{_datadir}/mimelnk/application/x-k3b.desktop
%{_libdir}/libk3b*.so.*
@@ -211,23 +215,22 @@
%{_datadir}/config/*
%{_datadir}/sounds/*
%{_datadir}/icons/hicolor/*/*/*
-%doc %{_docdir}/HTML/en/%{name}/*
# files from i18n
-%lang(da) %doc %{_docdir}/HTML/da/%{name}/*
-%lang(de) %doc %{_docdir}/HTML/de/%{name}/*
-%lang(en) %doc %{_docdir}/HTML/en/%{name}/*
-%lang(es) %doc %{_docdir}/HTML/es/%{name}/*
-%lang(et) %doc %{_docdir}/HTML/et/%{name}/*
-%lang(fr) %doc %{_docdir}/HTML/fr/%{name}/*
-%lang(it) %doc %{_docdir}/HTML/it/%{name}/*
-%lang(nl) %doc %{_docdir}/HTML/nl/%{name}/*
-%lang(pt) %doc %{_docdir}/HTML/pt/%{name}/*
-%lang(pt_BR) %doc %{_docdir}/HTML/pt_BR/%{name}/*
-%lang(ru) %doc %{_docdir}/HTML/ru/%{name}/*
-%lang(sv) %doc %{_docdir}/HTML/sv/%{name}/*
-%lang(uk) %doc %{_docdir}/HTML/uk/%{name}/*
-%lang(pl) %doc %{_docdir}/HTML/pl/%{name}/*
+%lang(da) %{_docdir}/HTML/da/%{name}/*
+%lang(de) %{_docdir}/HTML/de/%{name}/*
+%lang(en) %{_docdir}/HTML/en/%{name}/*
+%lang(es) %{_docdir}/HTML/es/%{name}/*
+%lang(et) %{_docdir}/HTML/et/%{name}/*
+%lang(fr) %{_docdir}/HTML/fr/%{name}/*
+%lang(it) %{_docdir}/HTML/it/%{name}/*
+%lang(nl) %{_docdir}/HTML/nl/%{name}/*
+%lang(pt) %{_docdir}/HTML/pt/%{name}/*
+%lang(pt_BR) %{_docdir}/HTML/pt_BR/%{name}/*
+%lang(ru) %{_docdir}/HTML/ru/%{name}/*
+%lang(sv) %{_docdir}/HTML/sv/%{name}/*
+%lang(uk) %{_docdir}/HTML/uk/%{name}/*
+%lang(pl) %{_docdir}/HTML/pl/%{name}/*
%if 0%{?devel}
%files devel
@@ -238,6 +241,11 @@
%changelog
+* Mon Jun 30 2008 Rex Dieter <rdieter at fedoraproject.org> - 0:1.0.5-3
+- No association k3b with .iso files in gnome (#419681)
+- scriptlet deps
+- cleanup doc/HTML
+
* Sat May 31 2008 Rex Dieter <rdieter at fedoraproject.org> - 0:1.0.5-2
- (re)enable reload patch
More information about the scm-commits
mailing list