rpms/k3b/F-7 k3b-1.0.1-hidden.patch,NONE,1.1 k3b.spec,1.41,1.42

[Harald Hoyer (harald)]

Author: harald

Update of /cvs/pkgs/rpms/k3b/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv688

Modified Files:
	k3b.spec 
Added Files:
	k3b-1.0.1-hidden.patch 
Log Message:
- k3b-iso.desktop,k3b-cue.desktop: +NoDisplay=true (#244513)


k3b-1.0.1-hidden.patch:

--- NEW FILE k3b-1.0.1-hidden.patch ---
--- k3b-1.0.1/src/Makefile.am.hidden	2007-04-18 10:43:19.000000000 -0500
+++ k3b-1.0.1/src/Makefile.am	2007-06-16 14:36:27.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:
--- k3b-1.0.1/src/k3b-iso.desktop.hidden	2007-04-18 10:43:19.000000000 -0500
+++ k3b-1.0.1/src/k3b-iso.desktop	2007-06-16 14:57:20.000000000 -0500
@@ -10,3 +10,4 @@ Name[bn]=কে-থ্রি-বি
 Name[hi]=के3बी
 MimeType=application/x-iso;
 Encoding=UTF-8
+NoDisplay=true
--- k3b-1.0.1/src/k3b-cue.desktop.hidden	2007-04-18 10:43:19.000000000 -0500
+++ k3b-1.0.1/src/k3b-cue.desktop	2007-06-16 14:57:29.000000000 -0500
@@ -9,5 +9,5 @@ Name[ar]= K3b
 Name[bn]=কে-থ্রি-বি
 Name[hi]=के3बी
 MimeType=application/x-cue;
-
 Encoding=UTF-8
+NoDisplay=true


Index: k3b.spec
===================================================================
RCS file: /cvs/pkgs/rpms/k3b/F-7/k3b.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- k3b.spec	7 Jun 2007 14:05:05 -0000	1.41
+++ k3b.spec	20 Jun 2007 10:46:19 -0000	1.42
@@ -10,7 +10,7 @@
 Summary: CD/DVD burning application for KDE
 Epoch:   0
 Version: 1.0.1
-Release: 1%{?dist}
+Release: 1%{?dist}.2
 
 Group:   Applications/Archiving
 License: GPL
@@ -20,6 +20,8 @@
 Source2: k3brc
 
 Patch1: k3b-i18n-0.12.17-rellink.patch
+# See http://bugzilla.redhat.com/244513
+Patch2: k3b-1.0.1-hidden.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -81,6 +83,9 @@
 make -f admin/Makefile.common
 popd
 
+%patch2 -p1 -b .hidden
+make -f admin/Makefile.common
+
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -121,11 +126,9 @@
 
 %{__install} -D -m 644 -p %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/config/k3brc
 
-# 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
+  $RPM_BUILD_ROOT%{_datadir}/applications/kde/*.desktop
 
 # remove the .la files
 rm -f $RPM_BUILD_ROOT%{_libdir}/libk3b*.la 
@@ -171,10 +174,7 @@
 %defattr(-,root,root,755)
 %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}/applications/kde/*.desktop
 %{_datadir}/mimelnk/application/x-k3b.desktop
 %{_libdir}/libk3b*.so.*
 
@@ -217,6 +217,12 @@
 
 
 %changelog
+* Wed Jun 20 2007 Harald Hoyer <harald at redhat.com> - 0:1.0.1-1.2
+- k3b-1.0.1-1.2 update release for F-7
+
+* Sat Jun 16 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 0:1.0.1-1.2
+- k3b-iso.desktop,k3b-cue.desktop: +NoDisplay=true (#244513)
+
 * Thu Jun  7 2007 Harald Hoyer <harald at redhat.com> - 0:1.0.1-1
 - k3b-1.0.1 update release for F-7