RPM Packaging: add libr/elficon stuff

5 files changed, 204 insertions, 4 deletions

diff --git a/redhat/Makefile.r14 b/redhat/Makefile.r14
index 1ad7a4480..321a0033d 100644
--- a/redhat/Makefile.r14
+++ b/redhat/Makefile.r14
@@ -21,10 +21,10 @@ buildpkg = \
 
 
 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
+dependencies:	tqt3 tqtinterface akode arts libart_lgpl libcaldav libcarddav sip4-tqt tqca tqca-tls avahi-tqt dbus-tqt dbus-1-tqt libr
 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 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
+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 qalcultate 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
 i18n:	gwenview-i18n k3b-i18n koffice-i18n tde-i18n
 extras:	icons-crystalsvg-updated icons-kfaenza icons-nuvola icons-oxygen kdevmon kdissert klamav klibido knoda kompose koverartist kpacman mathemagics png2qrgb style-ia-ora
 
@@ -54,6 +54,9 @@ libcaldav: tqtinterface autoconf libcurl
 libcarddav:	tqtinterface autoconf libcurl
 	$(call buildpkg,dependencies/libcarddav)
 	
+libr:
+	$(call buildpkg,dependencies/libr)
+
 python-tqt: sip4-tqt tdelibs
 	$(call buildpkg,dependencies/python-tqt)
 
diff --git a/redhat/build/get_rpm_package_name.sh b/redhat/build/get_rpm_package_name.sh
index b4ec6658c..8d12a91cf 100755
--- a/redhat/build/get_rpm_package_name.sh
+++ b/redhat/build/get_rpm_package_name.sh
@@ -26,7 +26,7 @@ case "${PKGNAME}" in
   # 3rd party dependencies
   "dirmngr"|"esound"|"fileshareset"|"hk_classes"|"lcms"|"python-qt3"|"tar") PREFIX="";;
   # Extra build stuff
-  "autoconf"|"automake"|"cmake"|"gnuchess"|"htdig"|"imlib1"|"libconfig"|"libotr3"|"libtool2"|"lilypond"|"m4"|"mftrace"|"pan"|"pcsc-perl"|"torsocks"|"wv2") PREFIX="";;
+  "autoconf"|"automake"|"cmake"|"gnuchess"|"htdig"|"imlib1"|"libconfig"|"libotr3"|"libr"|"libtool2"|"lilypond"|"m4"|"mftrace"|"pan"|"pcsc-perl"|"torsocks"|"wv2") PREFIX="";;
   # Other
   "curl") PREFIX="trinity-lib";;
   # Default case: add prefix
@@ -55,6 +55,7 @@ case "${PKGNAME}" in
   "libkdcraw")        PKGRUNTIME="${lib}kdcraw4";;
   "libkexiv2")        PKGRUNTIME="${lib}kexiv2-5";;
   "libkipi")          PKGRUNTIME="${lib}kipi0";;
+  "libr")             PKGRUNTIME="${lib}r";;
   "tqscintilla")      PKGRUNTIME="${lib}tqscintilla7";;
   "tqca")             PKGRUNTIME="${lib}tqca1";;
   "tqca-tls")         PKGRUNTIME="${lib}tqt3-mt-tqca-tls";;
@@ -100,6 +101,7 @@ if [ -n "${DEVEL}" ]; then
     "libkdcraw")   PKGDEVEL="${lib}kdcraw-devel";;
     "libkexiv2")   PKGDEVEL="${lib}kexiv2-devel";;
     "libkipi")     PKGDEVEL="${lib}kipi-devel";;
+    "libr")        PKGDEVEL="${lib}r-devel";;
     "tqca")        PKGDEVEL="${lib}tqca-devel";;
     "tqscintilla") PKGDEVEL="${lib}tqscintilla-devel";;
     "tqt3")        PKGDEVEL="tqt3-dev-tools tqt3-apps-devel tqt3-compat-headers ${lib}tqt3-mt-sqlite3";;
diff --git a/redhat/dependencies/libr/libr.spec b/redhat/dependencies/libr/libr.spec
new file mode 100644
index 000000000..b3d94ae3d
--- /dev/null
+++ b/redhat/dependencies/libr/libr.spec
@@ -0,0 +1,178 @@
+#
+# spec file for package libr (version R14)
+#
+# Copyright (c) 2014 Trinity Desktop Environment
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+#
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
+#
+
+# TDE variables
+%if "%{?tde_version}" == ""
+%define tde_version 14.1.0
+%endif
+
+%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
+%define libr %{_lib}r
+%else
+%define libr libr
+%endif
+
+
+Name:		trinity-libr
+Version:	0.6.0
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	ELF binary resource library
+Group:		System/Libraries
+URL:		http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Project
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		/usr
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	libtqt4-devel >= %{tde_epoch}:4.2.0
+
+BuildRequires:	cmake >= 2.8
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+
+# GLADE2
+%if 0%{?mageia} || 0%{?mandriva} || 0%{?pclinuxos}
+BuildRequires:	%{_lib}glade2.0_0-devel
+%else
+BuildRequires:	libglade2.0_0
+%endif
+
+
+%description
+Store and retrieve resources from ELF binaries.
+
+##########
+
+%package -n %{libr}
+Summary:		Simple inter-process messaging system (TQt-based shared library)
+Group:			System/Libraries
+
+%description -n %{libr}
+Store and retrieve resources from ELF binaries.
+
+%post -n %{libr}
+/sbin/ldconfig || :
+
+%postun -n %{libr}
+/sbin/ldconfig || :
+
+%files -n %{libr}
+%defattr(-,root,root,-)
+%{_libdir}/libr.so.0
+%{_libdir}/libr.so.0.0.0
+
+
+##########
+
+%package -n %{libr}-devel
+Summary:		Simple inter-process messaging system (TQt interface)
+Group:			Development/Libraries/C and C++
+Requires:		%{libr} == %{version}-%{release}
+Provides:		libr-devel == %{version}-%{release}
+
+%description -n %{libr}-devel
+Store and retrieve resources from ELF binaries.
+
+%post -n %{libr}-devel
+/sbin/ldconfig || :
+
+%postun -n %{libr}-devel
+/sbin/ldconfig || :
+
+%files -n %{libr}-devel
+%defattr(-,root,root,-)
+%{_includedir}/libr/
+%{_libdir}/libr.a
+%{_libdir}/libr.la
+%{_libdir}/libr.so
+%{_libdir}/pkgconfig/libr.pc
+%{_mandir}/man3/IconSVG.3*
+%{_mandir}/man3/OneCanvasIconInfo.3*
+%{_mandir}/man3/libr_clear.3*
+%{_mandir}/man3/libr_close.3*
+%{_mandir}/man3/libr_errmsg.3*
+%{_mandir}/man3/libr_errno.3*
+%{_mandir}/man3/libr_icon_close.3*
+%{_mandir}/man3/libr_icon_geticon_byname.3*
+%{_mandir}/man3/libr_icon_geticon_bysize.3*
+%{_mandir}/man3/libr_icon_getuuid.3*
+%{_mandir}/man3/libr_icon_setuuid.3*
+%{_mandir}/man3/libr_list.3*
+%{_mandir}/man3/libr_malloc.3*
+%{_mandir}/man3/libr_open.3*
+%{_mandir}/man3/libr_read.3*
+%{_mandir}/man3/libr_resources.3*
+%{_mandir}/man3/libr_size.3*
+%{_mandir}/man3/libr_status.3*
+%{_mandir}/man3/libr_write.3*
+
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+##########
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+
+%build
+unset QTDIR QTINC QTLIB
+
+if ! rpm -E %%cmake|grep -q "cd build"; then
+  %__mkdir_p build
+  cd build
+fi
+
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+  -DCMAKE_SKIP_RPATH=ON \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
+  \
+  -DINCLUDE_INSTALL_DIR=%{_includedir} \
+  -DLIB_INSTALL_DIR=%{_libdir} \
+  ..
+
+%__make %{?_smp_mflags}
+
+
+%install
+%__rm -rf %{?buildroot}
+%__make install DESTDIR=%{?buildroot} -C build
+
+
+%clean
+%__rm -rf %{?buildroot}
+
+
+%changelog
diff --git a/redhat/main/tdebase/tdebase-14.0.0.spec b/redhat/main/tdebase/tdebase-14.0.0.spec
index 8473edf0a..56177c354 100644
--- a/redhat/main/tdebase/tdebase-14.0.0.spec
+++ b/redhat/main/tdebase/tdebase-14.0.0.spec
@@ -1260,6 +1260,11 @@ plugdev group.
 %{tde_datadir}/icons/hicolor/*/apps/kcmspellchecking.png
 %{tde_tdedocdir}/HTML/en/tdefontview/
 
+# tdehwtray
+%{tde_bindir}/tdehwdevicetray
+%{tde_tdeappdir}/tdehwdevicetray.desktop
+%{tde_datadir}/autostart/tdehwdevicetray-autostart.desktop
+
 # The following features are not compiled under RHEL 5 and older
 %if 0%{?with_tderandrtray}
 %{tde_bindir}/tderandrtray
@@ -2219,6 +2224,7 @@ already. Most users won't need this.
 %{tde_bindir}/%{tdm}ctl
 %{tde_bindir}/%{tdm}_greet
 %{tde_bindir}/krootimage
+%{tde_bindir}/tdecryptocardwatcher
 %dir %{tdm_datadir}
 %dir %{tdm_datadir}/pics
 %{tdm_datadir}/pics/kdelogo.png
@@ -3636,7 +3642,7 @@ fi
   %{?with_hal:-DWITH_HAL=ON} \
   %{?!with_tdehwlib:-DWITH_TDEHWLIB=OFF} \
   -DWITH_UPOWER=ON \
-  -DWITH_ELFICON=OFF \
+  -DWITH_ELFICON=ON \
   \
   -DBUILD_ALL=ON \
 %if 0%{?suse_version}
diff --git a/redhat/main/tdelibs/tdelibs-14.0.0.spec b/redhat/main/tdelibs/tdelibs-14.0.0.spec
index 52bec8d2e..1a08324ea 100644
--- a/redhat/main/tdelibs/tdelibs-14.0.0.spec
+++ b/redhat/main/tdelibs/tdelibs-14.0.0.spec
@@ -404,6 +404,17 @@ BuildRequires:	pkcs11-helper-devel
 %endif
 BuildRequires:	opensc
 
+# CRYPTSETUP support
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires:	%{_lib}cryptsetup-devel
+%else
+BuildRequires:	libcryptsetup-devel
+%endif
+
+# ELFICON support
+%define with_elficon 1
+BuildRequires:		libr-devel >= 0.6.0
+
 
 %description
 Libraries for the Trinity Desktop Environment: