summaryrefslogtreecommitdiffstats
path: root/redhat
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-07-25 11:26:29 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-07-25 11:26:29 -0500
commit816233c64696a4c6f93313fc9ada3c3fbfc3319f (patch)
tree5d620e924b541a6c1c467c543f53556afba8f365 /redhat
parentcdd8c74a19c637d61cdcc3cfaefbb2686faf461b (diff)
parent920f06f2b0fb1547c39b4c63391e3c2a44979621 (diff)
downloadtde-packaging-816233c64696a4c6f93313fc9ada3c3fbfc3319f.tar.gz
tde-packaging-816233c64696a4c6f93313fc9ada3c3fbfc3319f.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'redhat')
-rw-r--r--redhat/buildenv.sh3
-rw-r--r--redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec14
2 files changed, 10 insertions, 7 deletions
diff --git a/redhat/buildenv.sh b/redhat/buildenv.sh
index da59a2953..408f33759 100644
--- a/redhat/buildenv.sh
+++ b/redhat/buildenv.sh
@@ -53,3 +53,6 @@ checknew() {
# Build local repository metadata (Mageia)
alias cru='(cdrpm; genhdlist2 noarch; genhdlist2 $(uname -i); sudo urpmi.update rpmbuild.$(uname -i) rpmbuild.noarch)'
alias cruc='(cdrpm; genhdlist2 --clean noarch; genhdlist2 --clean $(uname -i); sudo urpmi.update rpmbuild.$(uname -i) rpmbuild.noarch)'
+
+# Build local repository (RHEL)
+alias cry='(cdrpm; createrepo $(uname -i); createrepo noarch; sudo yum clean all --disablerepo="*" --enablerepo="rpmbuild*")'
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 e13fcd7dd..38909b465 100644
--- a/redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec
+++ b/redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec
@@ -98,6 +98,7 @@ Requires: trinity-k3b
Requires: trinity-k9copy
Requires: trinity-kaffeine
Requires: trinity-kaffeine-mozilla
+Requires: trinity-kasablanca
Requires: trinity-katapult
Requires: trinity-kbarcode
Requires: trinity-kbfx
@@ -116,6 +117,7 @@ Requires: trinity-kdiff3
Requires: trinity-kdirstat
Requires: trinity-keep
Requires: trinity-kerberostray
+Requires: trinity-kftpgrabber
Requires: trinity-kile
Requires: trinity-kima
Requires: trinity-kiosktool
@@ -127,6 +129,7 @@ Requires: trinity-knetload
Requires: trinity-knetstats
Requires: trinity-knights
Requires: trinity-knowit
+Requires: trinity-knmap
Requires: trinity-knutclient
Requires: trinity-koffice-suite
Requires: trinity-konversation
@@ -135,8 +138,10 @@ Requires: trinity-kpicosim
Requires: trinity-kpilot
Requires: trinity-krename
Requires: trinity-krusader
+Requires: trinity-ksensors
Requires: trinity-ksplash-engine-moodin
Requires: trinity-ksquirrel
+Requires: trinity-kshowmail
Requires: trinity-kstreamripper
Requires: trinity-ksystemlog
Requires: trinity-ktechlab
@@ -145,6 +150,7 @@ Requires: trinity-kuickshow
Requires: trinity-kvirc
Requires: trinity-kvkbd
Requires: trinity-kvpnc
+Requires: trinity-mplayerthumbs
Requires: trinity-piklab
Requires: trinity-potracegui
Requires: trinity-rosegarden
@@ -157,6 +163,7 @@ Requires: trinity-tde-style-lipstik
Requires: trinity-tde-style-qtcurve
Requires: trinity-tde-systemsettings
Requires: trinity-tdeio-apt
+Requires: trinity-tdeio-ftps
Requires: trinity-tdeio-locate
Requires: trinity-tdeio-umountwrapper
Requires: trinity-tdenetworkmanager
@@ -206,21 +213,14 @@ Group: User Interface/Desktops
Summary: Meta-package to install all extras (unofficial) TDE packages
Requires: trinity-akode
-Requires: trinity-kasablanca
#Requires: trinity-kdebluetooth
#Requires: trinity-kcheckgmail
Requires: trinity-icons-crystalsvg-updated
Requires: trinity-icons-kfaenza
Requires: trinity-icons-oxygen
-Requires: trinity-kftpgrabber
Requires: trinity-kickoff-i18n
-Requires: trinity-knmap
#Requires: trinity-knoda
-Requires: trinity-ksensors
-Requires: trinity-kshowmail
-Requires: trinity-mplayerthumbs
Requires: trinity-style-ia-ora
-Requires: trinity-tdeio-ftps-plugin
#Requires: trinity-tdeio-sysinfo-plugin
Requires: trinity-theme-baghira
Requires: trinity-tork