Branch: master

7a5be331 2014-10-05 08:48:44 François Andriot
RPM Packaging: update tdelibs
M redhat/Makefile.r14
M redhat/tdelibs/tdelibs-14.0.0.spec
diff --git a/redhat/Makefile.r14 b/redhat/Makefile.r14
index c44c81d..1ce207a 100644
--- a/redhat/Makefile.r14
+++ b/redhat/Makefile.r14
@@ -26,7 +26,7 @@
 libraries:	libkdcraw libkexiv2 libkipi libksquirrel libtdeldap libtqt-perl pytdeextensions python-trinity
 applications:	abakus amarok basket bibletime digikam dolphin filelight gtk3-tqt-engine gtk-qt-engine gwenview k3b k9copy kaffeine kaffeine-mozilla kasablanca katapult kbarcode kbfx kbibtex kbiff kbookreader kchmviewer kcmautostart kcmldap kcmldapcontroller kcmldapmanager kcpuload kdbg kdbusnotification kdiff3 kdirstat keep kerberostray kftpgrabber kile kima kiosktool kkbswitch klcddimmer kmplayer kmyfirewall kmymoney knemo knetload knetstats knights knmap knowit knutclient koffice konversation kopete-otr kpicosim kpilot krecipes krename krusader kscope ksensors kshowmail kshutdown ksplash-engine-moodin ksquirrel kstreamripper ksystemlog ktechlab ktorrent kuickshow kvirc kvkbd kvpnc mplayerthumbs piklab potracegui qt4-tqt-theme-engine rosegarden smartcardauth smb4k soundkonverter tde-guidance tdeio-apt tdeio-ftps tdeio-locate tdeio-sword tdeio-umountwrapper tdenetworkmanager tdepowersave tderadio tde-style-lipstik tde-style-qtcurve tdesudo tdesvn tde-systemsettings tdmtheme tellico tork twin-style-crystal wlassistant yakuake
 i18n:	gwenview-i18n k3b-i18n koffice-i18n tde-i18n
-extras:	icons-nuvola kdevmon kdissert klamav kompose koverartist kpacman style-ia-ora
+extras:	icons-nuvola kdevmon kdissert klamav kompose koverartist kpacman png2qrgb style-ia-ora
 
 
 ### Trinity Dependencies
@@ -686,6 +686,9 @@
 kpacman:
 	$(call buildpkg,extras/kpacman)
 
+png2qrgb:
+	$(call buildpkg,extras/png2qrgb)
+
 style-ia-ora:
 	$(call buildpkg,extras/style-ia-ora)
 
diff --git a/redhat/tdelibs/tdelibs-14.0.0.spec b/redhat/tdelibs/tdelibs-14.0.0.spec
index 2b7839a..6109da5 100644
--- a/redhat/tdelibs/tdelibs-14.0.0.spec
+++ b/redhat/tdelibs/tdelibs-14.0.0.spec
@@ -630,9 +630,9 @@
 %endif
 
 # Remove setuid bit on some binaries.
-chmod -s "%{?buildroot}%{tde_bindir}/kgrantpty"
-chmod -s "%{?buildroot}%{tde_bindir}/kpac_dhcp_helper"
-chmod -s "%{?buildroot}%{tde_bindir}/start_tdeinit"
+chmod 0755 "%{?buildroot}%{tde_bindir}/kgrantpty"
+chmod 0755 "%{?buildroot}%{tde_bindir}/kpac_dhcp_helper"
+chmod 0755 "%{?buildroot}%{tde_bindir}/start_tdeinit"
 
 # fileshareset 2.0 is provided separately.
 # Remove integrated fileshareset 1.0 .