View | Details | Raw Unified | Return to bug 8507
Collapse All | Expand All

(-)kdebase.spec (-66 / +70 lines)
Lines 3-14 Link Here
3
3
4
%define applnk %_datadir/applnk
4
%define applnk %_datadir/applnk
5
%define kdemenu %_datadir/applications/kde
5
%define kdemenu %_datadir/applications/kde
6
%define qtdir /usr/lib/qt3
6
%define qtdir %_libdir/qt3
7
%define x11confdir %_sysconfdir/X11
7
%define x11confdir %_sysconfdir/X11
8
8
9
%define alternatives_ver 0.2
9
%define req_design_graphics design-graphics >= 3.1.1
10
%define req_design_graphics design-graphics >= 3.1.1
10
%if "%{get_version alternatives}" > "0.0.9"
11
%if "%{get_version alternatives}" > "0.0.9"
11
%if "%{get_version alternatives}" < "0.1.9"
12
%if "%{get_version alternatives}" < "0.1.9"
13
%undefine alternatives_ver
12
%define alternatives_ver 0.1
14
%define alternatives_ver 0.1
13
%endif
15
%endif
14
%endif
16
%endif
Lines 504-510 Link Here
504
%patch1044 -p1
506
%patch1044 -p1
505
%patch1045 -p1
507
%patch1045 -p1
506
%patch1046 -p1
508
%patch1046 -p1
507
%patch1047 -p1
509
#%patch1047 -p1
508
510
509
# Sergey A. Sukiyazov <corwin@micom.don.ru>
511
# Sergey A. Sukiyazov <corwin@micom.don.ru>
510
%patch2000 -p1
512
%patch2000 -p1
Lines 591-598 Link Here
591
		    --with-kdm-xconsole \
593
		    --with-kdm-xconsole \
592
		    --with-motif \
594
		    --with-motif \
593
		    --with-ssl-dir=%prefix \
595
		    --with-ssl-dir=%prefix \
594
		    --with-motif-includes=/usr/X11R6/include/Xm \
596
		    --with-motif-includes=%_x11includedir/Xm \
595
		    --with-motif-libraries=/usr/X11R6/lib/ \
597
		    --with-motif-libraries=%_x11libdir \
596
		    --program-transform-name=""
598
		    --program-transform-name=""
597
599
598
%make_build
600
%make_build
Lines 897-911 Link Here
897
	subst "s|.*\/usr\/share\/config\/.*||" $f
899
	subst "s|.*\/usr\/share\/config\/.*||" $f
898
	subst "s|.*\/usr\/share\/config\.kcfg\/.*||" $f
900
	subst "s|.*\/usr\/share\/config\.kcfg\/.*||" $f
899
	subst "s/.*\/usr\/share\/doc\/.*//" $f
901
	subst "s/.*\/usr\/share\/doc\/.*//" $f
900
	subst "s/\(\/usr\/lib\/.*\)\.so.*/\1.so*/" $f
902
	subst "s@\(%_libdir\/.*\)\.so.*@\1.so*@" $f
901
	subst "s/.*\/usr\/share\/config\/kdm.*//" $f
903
	subst "s/.*\/usr\/share\/config\/kdm.*//" $f
902
	# filelist changes
904
	# filelist changes
903
	subst "s/.*\/usr\/lib\/krandrinithack\.so.*//" $f
905
	subst "s@.*%_libdir\/krandrinithack\.so.*@@" $f
904
	subst "s/.*\/usr\/share\/apps\/konqueror\/profiles\/filepreview//" $f
906
	subst "s/.*\/usr\/share\/apps\/konqueror\/profiles\/filepreview//" $f
905
	#
907
	#
906
	mv $f $f.tmp
908
	mv $f $f.tmp
907
	    grep -v -e.*\.la{,\ }$        $f.tmp >> $f
909
	    grep -v -e.*\.la{,\ }$        $f.tmp >> $f
908
	    grep -e\/usr\/lib\/kde3\/.*\.la{,\ }$   $f.tmp >> $f ||:
910
	    grep -e\/usr\/%_lib\/kde3\/.*\.la{,\ }$   $f.tmp >> $f ||:
909
	rm -f $f.tmp
911
	rm -f $f.tmp
910
    done
912
    done
911
913
Lines 961-967 Link Here
961
		;;
963
		;;
962
	    *)
964
	    *)
963
		cat $f | \
965
		cat $f | \
964
		    grep -v /lib/kde3/kgreet_ | \
966
		    grep -v /%_lib/kde3/kgreet_ | \
965
		    grep -v -e{\/usr\/bin\/kcheckpass,\/usr\/bin\/kdesud} \
967
		    grep -v -e{\/usr\/bin\/kcheckpass,\/usr\/bin\/kdesud} \
966
		    >> $L/libs
968
		    >> $L/libs
967
		;;
969
		;;
Lines 1001-1007 Link Here
1001
%applnk/Settings/WebBrowsing/nsplugin.desktop
1003
%applnk/Settings/WebBrowsing/nsplugin.desktop
1002
%applnk/.hidden/smb.desktop
1004
%applnk/.hidden/smb.desktop
1003
%applnk/Settings/WebBrowsing/smb.desktop
1005
%applnk/Settings/WebBrowsing/smb.desktop
1004
/usr/share/apps/kcmcss
1006
%_datadir/apps/kcmcss
1005
%_iconsdir/*/*/apps/cache.png
1007
%_iconsdir/*/*/apps/cache.png
1006
%_iconsdir/*/*/apps/proxy.png
1008
%_iconsdir/*/*/apps/proxy.png
1007
%_iconsdir/*/*/apps/cookie.png
1009
%_iconsdir/*/*/apps/cookie.png
Lines 1010-1019 Link Here
1010
%_iconsdir/*/*/apps/samba.png
1012
%_iconsdir/*/*/apps/samba.png
1011
%_iconsdir/*/*/apps/stylesheet.png
1013
%_iconsdir/*/*/apps/stylesheet.png
1012
%_iconsdir/*/*/apps/agent.png
1014
%_iconsdir/*/*/apps/agent.png
1013
/usr/share/services/searchproviders
1015
%_datadir/services/searchproviders
1014
/usr/share/services/useragentstrings
1016
%_datadir/services/useragentstrings
1015
/usr/share/servicetypes/searchprovider.desktop
1017
%_datadir/servicetypes/searchprovider.desktop
1016
/usr/share/servicetypes/uasprovider.desktop
1018
%_datadir/servicetypes/uasprovider.desktop
1017
__EOF__
1019
__EOF__
1018
1020
1019
    cat $L/kcmshell | perl -pi -e "s/(.*)/%exclude \1/" >>$L/kcontrol
1021
    cat $L/kcmshell | perl -pi -e "s/(.*)/%exclude \1/" >>$L/kcontrol
Lines 1151-1156 Link Here
1151
    mv $f $f.tmp
1153
    mv $f $f.tmp
1152
    cat $f.tmp | sort| uniq > $f
1154
    cat $f.tmp | sort| uniq > $f
1153
    rm -f $f.tmp
1155
    rm -f $f.tmp
1156
    subst "s@/usr/lib/@%_libdir/@" $f
1157
    subst "s@%_libdir/menu/@%_menudir/@" $f
1154
done
1158
done
1155
1159
1156
1160
Lines 1290-1339 Link Here
1290
%doc %_docdir/HTML/en/knetattach/
1294
%doc %_docdir/HTML/en/knetattach/
1291
1295
1292
%files wm -f file_lists/wm
1296
%files wm -f file_lists/wm
1293
%exclude /usr/bin/kdepasswd
1297
%exclude %_bindir/kdepasswd
1294
%exclude /usr/lib/menu/kdebase-configuration-kdepasswd
1298
%exclude %_menudir/kdebase-configuration-kdepasswd
1295
%exclude /usr/share/applications/kde/kdepasswd.desktop
1299
%exclude %_datadir/applications/kde/kdepasswd.desktop
1296
%exclude /usr/share/apps/kdesktop/DesktopLinks/Home.desktop
1300
%exclude %_datadir/apps/kdesktop/DesktopLinks/Home.desktop
1297
#
1301
#
1298
%config %_sysconfdir/rc.d/init.d/ksysguardd
1302
%config %_sysconfdir/rc.d/init.d/ksysguardd
1299
%config(noreplace) %_sysconfdir/X11/wmsession.d/*KDE
1303
%config(noreplace) %_sysconfdir/X11/wmsession.d/*KDE
1300
%config(noreplace) %_sysconfdir/pam.d/kscreensaver
1304
%config(noreplace) %_sysconfdir/pam.d/kscreensaver
1301
%attr(2711,root,utempter) %_bindir/konsole
1305
%attr(2711,root,utempter) %_bindir/konsole
1302
#%attr(2711,root,utempter) %_bindir/kwrited
1306
#%attr(2711,root,utempter) %_bindir/kwrited
1303
/usr/bin/mailsettings
1307
%_bindir/mailsettings
1304
/usr/bin/startkde
1308
%_bindir/startkde
1305
/usr/bin/startkde_safe
1309
%_bindir/startkde_safe
1306
/usr/bin/krandrinithack
1310
%_bindir/krandrinithack
1307
/usr/bin/kwin_rules_dialog
1311
%_bindir/kwin_rules_dialog
1308
#
1312
#
1309
/usr/bin/kompmgr
1313
%_bindir/kompmgr
1310
/usr/bin/krandrtray
1314
%_bindir/krandrtray
1311
/usr/lib/libkdeinit_kwin_rules_dialog.so*
1315
%_libdir/libkdeinit_kwin_rules_dialog.so*
1312
/usr/lib/kde3/kcm_randr.*
1316
%_libdir/kde3/kcm_randr.*
1313
/usr/lib/kde3/krandrinithack.*
1317
%_libdir/kde3/krandrinithack.*
1314
/usr/lib/kde3/kwin_rules_dialog.*
1318
%_libdir/kde3/kwin_rules_dialog.*
1315
/usr/lib/libkdeinit_krandrinithack.so*
1319
%_libdir/libkdeinit_krandrinithack.so*
1316
/usr/share/icons/*/*/*/randr.png
1320
%_iconsdir/*/*/*/randr.png
1317
/usr/share/applnk/.hidden/randr.desktop
1321
%_datadir/applnk/.hidden/randr.desktop
1318
/usr/share/applications/kde/krandrtray.desktop
1322
%_datadir/applications/kde/krandrtray.desktop
1319
/usr/lib/menu/kdebase-krandrtray
1323
%_menudir/kdebase-krandrtray
1320
#
1324
#
1321
/usr/lib/menu/kdebase-KBlankscreen
1325
%_menudir/kdebase-KBlankscreen
1322
/usr/lib/menu/kdebase-KRandom
1326
%_menudir/kdebase-KRandom
1323
/usr/lib/menu/kdebase-help
1327
%_menudir/kdebase-help
1324
#/usr/lib/menu/kdebase-kappfinder
1328
#%_menudir/kdebase-kappfinder
1325
/usr/lib/menu/kdebase-kcmkicker
1329
%_menudir/kdebase-kcmkicker
1326
/usr/lib/menu/kdebase-kfind
1330
%_menudir/kdebase-kfind
1327
/usr/lib/menu/kdebase-kinfocenter
1331
%_menudir/kdebase-kinfocenter
1328
/usr/lib/menu/kdebase-klipper
1332
%_menudir/kdebase-klipper
1329
/usr/lib/menu/kdebase-konsole
1333
%_menudir/kdebase-konsole
1330
/usr/lib/menu/kdebase-konsolesu
1334
%_menudir/kdebase-konsolesu
1331
/usr/lib/menu/kdebase-kpager
1335
%_menudir/kdebase-kpager
1332
/usr/lib/menu/kdebase-ksysguard
1336
%_menudir/kdebase-ksysguard
1333
/usr/lib/menu/kdebase-ktip
1337
%_menudir/kdebase-ktip
1334
/usr/lib/menu/kdebase-session
1338
%_menudir/kdebase-session
1335
/usr/lib/menu/kdebase-kate
1339
%_menudir/kdebase-kate
1336
/usr/lib/menu/kdebase-kwrite
1340
%_menudir/kdebase-kwrite
1337
%_datadir/apps/kappfinder/apps/Internet/mozilla-firefox.desktop
1341
%_datadir/apps/kappfinder/apps/Internet/mozilla-firefox.desktop
1338
%_datadir/apps/ksplash
1342
%_datadir/apps/ksplash
1339
%_datadir/apps/khelpcenter/
1343
%_datadir/apps/khelpcenter/
Lines 1342-1348 Link Here
1342
%dir %_datadir/apps/kate/scripts
1346
%dir %_datadir/apps/kate/scripts
1343
%_datadir/apps/khotkeys/
1347
%_datadir/apps/khotkeys/
1344
%_datadir/apps/kconf_update/konqueror_gestures_kde321_update.upd
1348
%_datadir/apps/kconf_update/konqueror_gestures_kde321_update.upd
1345
/usr/share/wallpapers/kde_blue.jpg
1349
%_datadir/wallpapers/kde_blue.jpg
1346
%_datadir/apps/kicker/wallpapers/default1.png
1350
%_datadir/apps/kicker/wallpapers/default1.png
1347
%dir %_datadir/apps/konsole/
1351
%dir %_datadir/apps/konsole/
1348
%_datadir/apps/konsole/icons/
1352
%_datadir/apps/konsole/icons/
Lines 1364-1388 Link Here
1364
%files kcmshell -f file_lists/kcmshell
1368
%files kcmshell -f file_lists/kcmshell
1365
1369
1366
%files kdeprint -f file_lists/kdeprint
1370
%files kdeprint -f file_lists/kdeprint
1367
/usr/lib/menu/kdebase-printmgr
1371
%_menudir/kdebase-printmgr
1368
/usr/lib/menu/kdebase-kjobviewer
1372
%_menudir/kdebase-kjobviewer
1369
/usr/lib/menu/kdebase-kdeprintfax
1373
%_menudir/kdebase-kdeprintfax
1370
%doc %_docdir/HTML/en/kdeprint
1374
%doc %_docdir/HTML/en/kdeprint
1371
1375
1372
%files konqueror -f file_lists/konqueror
1376
%files konqueror -f file_lists/konqueror
1373
%config /%_sysconfdir/alternatives/packages.d/%name-konqueror
1377
%config /%_sysconfdir/alternatives/packages.d/%name-konqueror
1374
%doc %_docdir/HTML/en/konqueror
1378
%doc %_docdir/HTML/en/konqueror
1375
/usr/share/apps/konqueror/servicemenus/convertpdftops.desktop
1379
%_datadir/apps/konqueror/servicemenus/convertpdftops.desktop
1376
/usr/share/apps/konqueror/servicemenus/convertpstopdf.desktop
1380
%_datadir/apps/konqueror/servicemenus/convertpstopdf.desktop
1377
/usr/lib/menu/kdebase-home
1381
%_menudir/kdebase-home
1378
/usr/lib/menu/kdebase-konqfilemgr
1382
%_menudir/kdebase-konqfilemgr
1379
/usr/lib/menu/kdebase-konqbrowser
1383
%_menudir/kdebase-konqbrowser
1380
/usr/lib/menu/kdebase-konqueror
1384
%_menudir/kdebase-konqueror
1381
/usr/lib/menu/kdebase-konquerorsu
1385
%_menudir/kdebase-konquerorsu
1382
/usr/lib/menu/kdebase-kfmclient
1386
%_menudir/kdebase-kfmclient
1383
/usr/lib/menu/kdebase-kfmclient_dir
1387
%_menudir/kdebase-kfmclient_dir
1384
/usr/lib/menu/kdebase-kfmclient_html
1388
%_menudir/kdebase-kfmclient_html
1385
/usr/lib/menu/kdebase-kfmclient_war
1389
%_menudir/kdebase-kfmclient_war
1386
#
1390
#
1387
1391
1388
%files kdm -f file_lists/kdm
1392
%files kdm -f file_lists/kdm

Return to bug 8507