3a2fc952 | 2016-05-06 06:20:23 | François Andriot |
RPM packaging: disable BFD on tdelibs |
||
M redhat/Makefile.r14 M redhat/main/tdelibs/tdelibs-14.0.0.spec M redhat/packages.el7 M redhat/packages.f23 M redhat/packages.oss421 |
||
diff --git a/redhat/Makefile.r14 b/redhat/Makefile.r14 index 3b9ba3e..b9f52d2 100644 --- a/redhat/Makefile.r14 +++ b/redhat/Makefile.r14 @@ -21,7 +21,7 @@ all: dependencies main libraries applications i18n meta extras -dependencies: tqt3 tqtinterface akode arts libart_lgpl libcaldav libcarddav sip4-tqt tqca tqca-tls avahi-tqt dbus-tqt dbus-1-tqt libr +dependencies: tqt3 tqtinterface akode arts libart_lgpl libcaldav libcarddav sip4-tqt tqca tqca-tls avahi-tqt dbus-tqt dbus-1-tqt main: tdelibs tdebase tdeaccessibility tdeadmin tdegames tdemultimedia tdepim tdetoys tdevelop tdeaddons tdeartwork tdebindings tdeedu tdegraphics tdenetwork tdesdk tdeutils tdewebdev 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 knetworkmanager8 knights knmap knowit knutclient koffice konversation kooldock kopete-otr kpicosim kpilot kplayer krecipes krename krusader kscope ksensors kshowmail kshutdown ksplash-engine-moodin ksquirrel kstreamripper ksystemlog ktechlab ktorrent kuickshow kvirc kvkbd kvpnc kxmleditor mplayerthumbs piklab potracegui qalculate-tde qt4-tqt-theme-engine rosegarden smartcardauth smb4k soundkonverter tastymenu tde-guidance tdeio-apt tdeio-ftps tdeio-locate tdeio-sword tdeio-umountwrapper tdenetworkmanager tdepowersave tderadio tde-style-lipstik tde-style-baghira tde-style-domino tde-style-ia-ora tde-style-qtcurve tdesudo tdesvn tde-systemsettings tdmtheme tellico tork twin-style-crystal wlassistant yakuake diff --git a/redhat/main/tdelibs/tdelibs-14.0.0.spec b/redhat/main/tdelibs/tdelibs-14.0.0.spec index 434eb5e..9f2b030 100644 --- a/redhat/main/tdelibs/tdelibs-14.0.0.spec +++ b/redhat/main/tdelibs/tdelibs-14.0.0.spec @@ -404,7 +404,7 @@ %endif # OPENSC support -%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?rhel} >= 7 || 0%{?fedora} +%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?rhel} >= 7 || 0%{?fedora} || 0%{?suse_version} BuildRequires: opensc %endif @@ -692,7 +692,7 @@ -DWITH_PKCS=ON \ -DWITH_CRYPTSETUP=ON \ %{?!with_lzma:-DWITH_LZMA=OFF} \ - -DWITH_LIBBFD=ON \ + -DWITH_LIBBFD=OFF \ %{?!with_xrandr:-DWITH_XRANDR=OFF} \ -DWITH_XCOMPOSITE=ON \ -DWITH_KDE4_MENU_SUFFIX=OFF \ diff --git a/redhat/packages.el7 b/redhat/packages.el7 index fa3e19c..8c94a8c 100644 --- a/redhat/packages.el7 +++ b/redhat/packages.el7 @@ -171,3 +171,5 @@ pilot-link-devel lirc-devel wireless-tools-devel +libudisks2-devel +cryptsetup-devel diff --git a/redhat/packages.f23 b/redhat/packages.f23 index 9948bff..9863d8c 100644 --- a/redhat/packages.f23 +++ b/redhat/packages.f23 @@ -196,3 +196,7 @@ libconfig-devel gtk3-devel usbutils +cryptsetup-devel +opensc +pcsc-lite-devel +pkcs11-helper-devel diff --git a/redhat/packages.oss421 b/redhat/packages.oss421 index 017398e..64dbb84 100644 --- a/redhat/packages.oss421 +++ b/redhat/packages.oss421 @@ -165,3 +165,6 @@ libffmpeg-devel mozilla-nspr-devel libpisock-devel +pkcs11-helper-devel +libcryptsetup-devel +opensc |