RPM packaging: minor updates for 14.0.x

4 files changed, 33 insertions, 8 deletions

diff --git a/redhat/Makefile.r14 b/redhat/Makefile.r14
index 58a03c0e5..3876bdd6c 100644
--- a/redhat/Makefile.r14
+++ b/redhat/Makefile.r14
@@ -26,7 +26,7 @@ main:	tdelibs tdebase tdeaccessibility tdeadmin tdegames tdemultimedia tdepim td
 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
 i18n:	gwenview-i18n k3b-i18n koffice-i18n tde-i18n
-extras:	icons-nuvola kdevmon kdissert klamav klibido knoda kompose koverartist kpacman mathemagics png2qrgb style-ia-ora
+extras:	icons-crystalsvg-updated icons-kfaenza icons-nuvola icons-oxygen kdevmon kdissert klamav klibido knoda kompose koverartist kpacman mathemagics png2qrgb style-ia-ora
 
 
 ### Trinity Dependencies
@@ -692,9 +692,18 @@ fileshareset:
 hk_classes:
 	$(call buildpkg,extras/hk_classes)
 
+icons-crystalsvg-updated:
+	$(call buildpkg,extras/icons-crystalsvg-updated)
+
+icons-kfaenza:
+	$(call buildpkg,extras/icons-kfaenza)
+
 icons-nuvola:
 	$(call buildpkg,extras/icons-nuvola)
 
+icons-oxygen:
+	$(call buildpkg,extras/icons-oxygen)
+
 kdevmon:
 	$(call buildpkg,extras/kdevmon)
 
@@ -738,6 +747,9 @@ scribus:
 style-ia-ora:
 	$(call buildpkg,extras/style-ia-ora)
 
+theme-baghira:
+	$(call buildpkg,extras/theme-baghira)
+
 trinity-filesystem:
 	$(call buildpkg,extras/trinity-filesystem)
 
diff --git a/redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec b/redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec
index 8ea011383..673e10022 100644
--- a/redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec
+++ b/redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec
@@ -267,16 +267,25 @@ Group:		User Interface/Desktops
 Summary:	Meta-package to install all extras (unofficial) TDE packages
 
 Requires:	trinity-akode
-#Requires:	trinity-kdebluetooth
-#Requires:	trinity-kcheckgmail
 Requires:	trinity-icons-crystalsvg-updated
 Requires:	trinity-icons-kfaenza
+Requires:	trinity-icons-nuvola
 Requires:	trinity-icons-oxygen
-Requires:	trinity-kickoff-i18n
-#Requires:	trinity-knoda
+#Requires:	trinity-kickoff-i18n
+#Requires:	trinity-kcheckgmail
+#Requires:	trinity-kdebluetooth
+Requires:	trinity-kdevmon
+Requires:	trinity-kdissert
+Requires:	trinity-klamav
+Requires:	trinity-klibido
+Requires:	trinity-knoda
+Requires:	trinity-kompose
+Requires:	trinity-koverartist
+Requires:	trinity-kpacman
+Requires:	trinity-mathemagics
 Requires:	trinity-style-ia-ora
 #Requires:	trinity-tdeio-sysinfo-plugin
-Requires:	trinity-theme-baghira
+#Requires:	trinity-theme-baghira
 
 
 %description extras
diff --git a/redhat/main/tdeadmin/tdeadmin-14.0.0.spec b/redhat/main/tdeadmin/tdeadmin-14.0.0.spec
index 580b654e0..8a171d34f 100644
--- a/redhat/main/tdeadmin/tdeadmin-14.0.0.spec
+++ b/redhat/main/tdeadmin/tdeadmin-14.0.0.spec
@@ -457,7 +457,11 @@ fi
   --with-rpm \
   --with-pam=kde \
   --with-shadow \
-  --with-private-groups
+  --with-private-groups \
+%if 0%{?fedora} >= 16 || 0%{?suse_version} >= 1210 || 0%{?rhel} >= 7 || 0%{?mageia} >= 4
+  --with-first-uid=1000 \
+  --with-first-gid=1000 \
+%endif
 
 %__make %{?_smp_mflags} || %__make
 
diff --git a/redhat/main/tdebase/tdebase-14.0.0.spec b/redhat/main/tdebase/tdebase-14.0.0.spec
index 7accd3610..2c8c0b313 100644
--- a/redhat/main/tdebase/tdebase-14.0.0.spec
+++ b/redhat/main/tdebase/tdebase-14.0.0.spec
@@ -3709,7 +3709,7 @@ EOF
 
 # TDM configuration
 %__sed -i "%{?buildroot}%{_sysconfdir}/trinity/%{tdm}/%{tdm}rc" \
-%if 0%{?fedora} >= 16 || 0%{?suse_version} >= 1210 || 0%{?rhel} >= 7
+%if 0%{?fedora} >= 16 || 0%{?suse_version} >= 1210 || 0%{?rhel} >= 7 || 0%{?mageia} >= 4
 	-e "s/^#*MinShowUID=.*/MinShowUID=1000/"
 %else
 	-e "s/^#*MinShowUID=.*/MinShowUID=500/"