Attachment 1249 Details for Bug 8507 – Proposed x86_64 build patch

[patch] Proposed x86_64 build patch

kdebase.spec.patch (text/plain), 7.24 KB, created by Damir Shayhutdinov on 2005-11-17 12:12:11 MSK

(hide)

Description:

Filename:

MIME Type:

Creator: Damir Shayhutdinov

Created: 2005-11-17 12:12:11 MSK

Size: 7.24 KB

patch

obsolete

>--- kdebase.spec	2005-09-06 15:15:51 +0400
>+++ kdebase.my.spec	2005-11-17 12:03:47 +0300
>@@ -3,12 +3,14 @@
> 
> %define applnk %_datadir/applnk
> %define kdemenu %_datadir/applications/kde
>-%define qtdir /usr/lib/qt3
>+%define qtdir %_libdir/qt3
> %define x11confdir %_sysconfdir/X11
> 
>+%define alternatives_ver 0.2
> %define req_design_graphics design-graphics >= 3.1.1
> %if "%{get_version alternatives}" > "0.0.9"
> %if "%{get_version alternatives}" < "0.1.9"
>+%undefine alternatives_ver
> %define alternatives_ver 0.1
> %endif
> %endif
>@@ -504,7 +506,7 @@
> %patch1044 -p1
> %patch1045 -p1
> %patch1046 -p1
>-%patch1047 -p1
>+#%patch1047 -p1
> 
> # Sergey A. Sukiyazov <corwin@micom.don.ru>
> %patch2000 -p1
>@@ -591,8 +593,8 @@
> 		    --with-kdm-xconsole \
> 		    --with-motif \
> 		    --with-ssl-dir=%prefix \
>-		    --with-motif-includes=/usr/X11R6/include/Xm \
>-		    --with-motif-libraries=/usr/X11R6/lib/ \
>+		    --with-motif-includes=%_x11includedir/Xm \
>+		    --with-motif-libraries=%_x11libdir \
> 		    --program-transform-name=""
> 
> %make_build
>@@ -897,15 +899,15 @@
> 	subst "s|.*\/usr\/share\/config\/.*||" $f
> 	subst "s|.*\/usr\/share\/config\.kcfg\/.*||" $f
> 	subst "s/.*\/usr\/share\/doc\/.*//" $f
>-	subst "s/$\/usr\/lib\/.*$\.so.*/\1.so*/" $f
>+	subst "s@$%_libdir\/.*$\.so.*@\1.so*@" $f
> 	subst "s/.*\/usr\/share\/config\/kdm.*//" $f
> 	# filelist changes
>-	subst "s/.*\/usr\/lib\/krandrinithack\.so.*//" $f
>+	subst "s@.*%_libdir\/krandrinithack\.so.*@@" $f
> 	subst "s/.*\/usr\/share\/apps\/konqueror\/profiles\/filepreview//" $f
> 	#
> 	mv $f $f.tmp
> 	    grep -v -e.*\.la{,\ }$        $f.tmp >> $f
>-	    grep -e\/usr\/lib\/kde3\/.*\.la{,\ }$   $f.tmp >> $f ||:
>+	    grep -e\/usr\/%_lib\/kde3\/.*\.la{,\ }$   $f.tmp >> $f ||:
> 	rm -f $f.tmp
>     done
> 
>@@ -961,7 +963,7 @@
> 		;;
> 	    *)
> 		cat $f | \
>-		    grep -v /lib/kde3/kgreet_ | \
>+		    grep -v /%_lib/kde3/kgreet_ | \
> 		    grep -v -e{\/usr\/bin\/kcheckpass,\/usr\/bin\/kdesud} \
> 		    >> $L/libs
> 		;;
>@@ -1001,7 +1003,7 @@
> %applnk/Settings/WebBrowsing/nsplugin.desktop
> %applnk/.hidden/smb.desktop
> %applnk/Settings/WebBrowsing/smb.desktop
>-/usr/share/apps/kcmcss
>+%_datadir/apps/kcmcss
> %_iconsdir/*/*/apps/cache.png
> %_iconsdir/*/*/apps/proxy.png
> %_iconsdir/*/*/apps/cookie.png
>@@ -1010,10 +1012,10 @@
> %_iconsdir/*/*/apps/samba.png
> %_iconsdir/*/*/apps/stylesheet.png
> %_iconsdir/*/*/apps/agent.png
>-/usr/share/services/searchproviders
>-/usr/share/services/useragentstrings
>-/usr/share/servicetypes/searchprovider.desktop
>-/usr/share/servicetypes/uasprovider.desktop
>+%_datadir/services/searchproviders
>+%_datadir/services/useragentstrings
>+%_datadir/servicetypes/searchprovider.desktop
>+%_datadir/servicetypes/uasprovider.desktop
> __EOF__
> 
>     cat $L/kcmshell | perl -pi -e "s/(.*)/%exclude \1/" >>$L/kcontrol
>@@ -1151,6 +1153,8 @@
>     mv $f $f.tmp
>     cat $f.tmp | sort| uniq > $f
>     rm -f $f.tmp
>+    subst "s@/usr/lib/@%_libdir/@" $f
>+    subst "s@%_libdir/menu/@%_menudir/@" $f
> done
> 
> 
>@@ -1290,50 +1294,50 @@
> %doc %_docdir/HTML/en/knetattach/
> 
> %files wm -f file_lists/wm
>-%exclude /usr/bin/kdepasswd
>-%exclude /usr/lib/menu/kdebase-configuration-kdepasswd
>-%exclude /usr/share/applications/kde/kdepasswd.desktop
>-%exclude /usr/share/apps/kdesktop/DesktopLinks/Home.desktop
>+%exclude %_bindir/kdepasswd
>+%exclude %_menudir/kdebase-configuration-kdepasswd
>+%exclude %_datadir/applications/kde/kdepasswd.desktop
>+%exclude %_datadir/apps/kdesktop/DesktopLinks/Home.desktop
> #
> %config %_sysconfdir/rc.d/init.d/ksysguardd
> %config(noreplace) %_sysconfdir/X11/wmsession.d/*KDE
> %config(noreplace) %_sysconfdir/pam.d/kscreensaver
> %attr(2711,root,utempter) %_bindir/konsole
> #%attr(2711,root,utempter) %_bindir/kwrited
>-/usr/bin/mailsettings
>-/usr/bin/startkde
>-/usr/bin/startkde_safe
>-/usr/bin/krandrinithack
>-/usr/bin/kwin_rules_dialog
>-#
>-/usr/bin/kompmgr
>-/usr/bin/krandrtray
>-/usr/lib/libkdeinit_kwin_rules_dialog.so*
>-/usr/lib/kde3/kcm_randr.*
>-/usr/lib/kde3/krandrinithack.*
>-/usr/lib/kde3/kwin_rules_dialog.*
>-/usr/lib/libkdeinit_krandrinithack.so*
>-/usr/share/icons/*/*/*/randr.png
>-/usr/share/applnk/.hidden/randr.desktop
>-/usr/share/applications/kde/krandrtray.desktop
>-/usr/lib/menu/kdebase-krandrtray
>-#
>-/usr/lib/menu/kdebase-KBlankscreen
>-/usr/lib/menu/kdebase-KRandom
>-/usr/lib/menu/kdebase-help
>-#/usr/lib/menu/kdebase-kappfinder
>-/usr/lib/menu/kdebase-kcmkicker
>-/usr/lib/menu/kdebase-kfind
>-/usr/lib/menu/kdebase-kinfocenter
>-/usr/lib/menu/kdebase-klipper
>-/usr/lib/menu/kdebase-konsole
>-/usr/lib/menu/kdebase-konsolesu
>-/usr/lib/menu/kdebase-kpager
>-/usr/lib/menu/kdebase-ksysguard
>-/usr/lib/menu/kdebase-ktip
>-/usr/lib/menu/kdebase-session
>-/usr/lib/menu/kdebase-kate
>-/usr/lib/menu/kdebase-kwrite
>+%_bindir/mailsettings
>+%_bindir/startkde
>+%_bindir/startkde_safe
>+%_bindir/krandrinithack
>+%_bindir/kwin_rules_dialog
>+#
>+%_bindir/kompmgr
>+%_bindir/krandrtray
>+%_libdir/libkdeinit_kwin_rules_dialog.so*
>+%_libdir/kde3/kcm_randr.*
>+%_libdir/kde3/krandrinithack.*
>+%_libdir/kde3/kwin_rules_dialog.*
>+%_libdir/libkdeinit_krandrinithack.so*
>+%_iconsdir/*/*/*/randr.png
>+%_datadir/applnk/.hidden/randr.desktop
>+%_datadir/applications/kde/krandrtray.desktop
>+%_menudir/kdebase-krandrtray
>+#
>+%_menudir/kdebase-KBlankscreen
>+%_menudir/kdebase-KRandom
>+%_menudir/kdebase-help
>+#%_menudir/kdebase-kappfinder
>+%_menudir/kdebase-kcmkicker
>+%_menudir/kdebase-kfind
>+%_menudir/kdebase-kinfocenter
>+%_menudir/kdebase-klipper
>+%_menudir/kdebase-konsole
>+%_menudir/kdebase-konsolesu
>+%_menudir/kdebase-kpager
>+%_menudir/kdebase-ksysguard
>+%_menudir/kdebase-ktip
>+%_menudir/kdebase-session
>+%_menudir/kdebase-kate
>+%_menudir/kdebase-kwrite
> %_datadir/apps/kappfinder/apps/Internet/mozilla-firefox.desktop
> %_datadir/apps/ksplash
> %_datadir/apps/khelpcenter/
>@@ -1342,7 +1346,7 @@
> %dir %_datadir/apps/kate/scripts
> %_datadir/apps/khotkeys/
> %_datadir/apps/kconf_update/konqueror_gestures_kde321_update.upd
>-/usr/share/wallpapers/kde_blue.jpg
>+%_datadir/wallpapers/kde_blue.jpg
> %_datadir/apps/kicker/wallpapers/default1.png
> %dir %_datadir/apps/konsole/
> %_datadir/apps/konsole/icons/
>@@ -1364,25 +1368,25 @@
> %files kcmshell -f file_lists/kcmshell
> 
> %files kdeprint -f file_lists/kdeprint
>-/usr/lib/menu/kdebase-printmgr
>-/usr/lib/menu/kdebase-kjobviewer
>-/usr/lib/menu/kdebase-kdeprintfax
>+%_menudir/kdebase-printmgr
>+%_menudir/kdebase-kjobviewer
>+%_menudir/kdebase-kdeprintfax
> %doc %_docdir/HTML/en/kdeprint
> 
> %files konqueror -f file_lists/konqueror
> %config /%_sysconfdir/alternatives/packages.d/%name-konqueror
> %doc %_docdir/HTML/en/konqueror
>-/usr/share/apps/konqueror/servicemenus/convertpdftops.desktop
>-/usr/share/apps/konqueror/servicemenus/convertpstopdf.desktop
>-/usr/lib/menu/kdebase-home
>-/usr/lib/menu/kdebase-konqfilemgr
>-/usr/lib/menu/kdebase-konqbrowser
>-/usr/lib/menu/kdebase-konqueror
>-/usr/lib/menu/kdebase-konquerorsu
>-/usr/lib/menu/kdebase-kfmclient
>-/usr/lib/menu/kdebase-kfmclient_dir
>-/usr/lib/menu/kdebase-kfmclient_html
>-/usr/lib/menu/kdebase-kfmclient_war
>+%_datadir/apps/konqueror/servicemenus/convertpdftops.desktop
>+%_datadir/apps/konqueror/servicemenus/convertpstopdf.desktop
>+%_menudir/kdebase-home
>+%_menudir/kdebase-konqfilemgr
>+%_menudir/kdebase-konqbrowser
>+%_menudir/kdebase-konqueror
>+%_menudir/kdebase-konquerorsu
>+%_menudir/kdebase-kfmclient
>+%_menudir/kdebase-kfmclient_dir
>+%_menudir/kdebase-kfmclient_html
>+%_menudir/kdebase-kfmclient_war
> #
> 
> %files kdm -f file_lists/kdm

Actions: View | Diff

Attachments on bug 8507: 1249