rpms/k3b/devel k3b-1.0.5-hidden.patch,1.1,1.2 k3b.spec,1.62,1.63

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	k3b-1.0.5-hidden.patch k3b.spec 
Log Message:
simplify patch, use autotools (maybe fix better later)


k3b-1.0.5-hidden.patch:

Index: k3b-1.0.5-hidden.patch
===================================================================
RCS file: /cvs/pkgs/rpms/k3b/devel/k3b-1.0.5-hidden.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- k3b-1.0.5-hidden.patch	30 Jun 2008 15:08:37 -0000	1.1
+++ k3b-1.0.5-hidden.patch	30 Jun 2008 15:28:22 -0000	1.2
@@ -1,17 +1,3 @@
-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


Index: k3b.spec
===================================================================
RCS file: /cvs/pkgs/rpms/k3b/devel/k3b.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- k3b.spec	30 Jun 2008 15:08:37 -0000	1.62
+++ k3b.spec	30 Jun 2008 15:28:22 -0000	1.63
@@ -99,6 +99,7 @@
 # set in k3brc instead
 #patch4 -p1 -b .manualbufsize
 %patch5 -p1 -b .hidden
+make -f admin/Makefile.common
 
 pushd %{name}-i18n-%{version}
 %patch1 -p2 -b .lns