diff options
| author | François Andriot <albator78@libertysurf.fr> | 2015-08-30 12:27:30 +0200 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2015-08-30 12:27:30 +0200 |
| commit | 972e86c4ebf80d36fffc6c9d02a3d1596ca61fb2 (patch) | |
| tree | ab6620583bc880bd61cceb0058ecc1f7e896b992 /redhat | |
| parent | e5f2386a7884932cffd7c862b6ddedbd2e8a6810 (diff) | |
| download | tde-packaging-972e86c4ebf80d36fffc6c9d02a3d1596ca61fb2.tar.gz tde-packaging-972e86c4ebf80d36fffc6c9d02a3d1596ca61fb2.zip | |
RPM packaging: massive update SPEC files
Diffstat (limited to 'redhat')
306 files changed, 400 insertions, 1160 deletions
diff --git a/redhat/Makefile.r14 b/redhat/Makefile.r14 index 3c778624d..f9e894c98 100644 --- a/redhat/Makefile.r14 +++ b/redhat/Makefile.r14 @@ -24,7 +24,7 @@ all: dependencies main libraries applications i18n meta extras dependencies: tqt3 tqtinterface arts libart_lgpl libcaldav libcarddav sip4-tqt tqca tqca-tls avahi-tqt dbus-tqt dbus-1-tqt akode 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 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 +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 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 @@ -97,7 +97,7 @@ tdeedu: tdebase tdegames: tdebase tdemultimedia $(call buildpkg,main/tdegames) -tdegraphics: tdebase poppler cmake +tdegraphics: tdebase poppler cmake lcms $(call buildpkg,main/tdegraphics) tdelibs: tqt3 tqtinterface arts dbus-tqt dbus-1-tqt cmake avahi-tqt fileshareset trinity-filesystem libart_lgpl @@ -109,7 +109,7 @@ tdemultimedia: tdebase akode tdenetwork: tdebase $(call buildpkg,main/tdenetwork) -tdepim: tdebase libcaldav libcarddav cmake +tdepim: tdebase libcaldav libcarddav cmake dirmngr $(call buildpkg,main/tdepim) tdesdk: tdebase tdebindings cmake @@ -146,6 +146,12 @@ ifneq ($(wildcard /boot/vmlinuz*.el5* /boot/vmlinuz*.el6*),) $(call buildpkg,3rdparty/cmake) endif +dirmngr: +# Build on CentOS >= 7 +ifneq ($(wildcard /boot/vmlinuz*.el7*),) + $(call buildpkg,3rdparty/dirmngr) +endif + esound: # Build on Mageia and CentOS >= 7 ifneq ($(wildcard /etc/mageia-release /boot/vmlinuz*.el7*),) @@ -174,6 +180,11 @@ endif endif endif +lcms: +ifneq ($(wildcard /boot/vmlinuz*.el7*),) + $(call buildpkg,3rdparty/lcms) +endif + libcurl: automake libtool2 # Build on CentOS 5 only ifneq ($(wildcard /boot/vmlinuz*.el4*),) @@ -226,8 +237,8 @@ ifneq ($(wildcard /boot/vmlinuz*.el5*),) endif torsocks: -# Do NOT build on RHEL 7 -ifeq ($(wildcard /boot/vmlinuz*.el7*),) +# Do NOT build on RHEL 6, RHEL 7 +ifeq ($(wildcard /boot/vmlinuz*.el6* /boot/vmlinuz*.el7*),) $(call buildpkg,3rdparty/torsocks) endif @@ -458,7 +469,9 @@ knetstats: tdebase $(call buildpkg,applications/knetstats) knetworkmanager8: tdebase +ifneq ($(wildcard /boot/vmlinuz*.el6*),) $(call buildpkg,applications/knetworkmanager8) +endif knights: tdebase gnuchess $(call buildpkg,applications/knights) diff --git a/redhat/applications/abakus/abakus-14.0.0.spec b/redhat/applications/abakus/abakus-14.0.0.spec index ee28da19b..9b67dc211 100644 --- a/redhat/applications/abakus/abakus-14.0.0.spec +++ b/redhat/applications/abakus/abakus-14.0.0.spec @@ -35,7 +35,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 0.91 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: Calculator for TDE Group: Applications/Utilities URL: http://www.trinitydesktop.org/ diff --git a/redhat/applications/abakus/abakus-3.5.13.2.spec b/redhat/applications/abakus/abakus-3.5.13.2.spec index 3536b5ad4..d0d76805a 100644 --- a/redhat/applications/abakus/abakus-3.5.13.2.spec +++ b/redhat/applications/abakus/abakus-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg abakus %define tde_version 3.5.13.2 -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -25,7 +20,7 @@ Name: trinity-%{tde_pkg} Summary: Calculator for TDE Version: 0.91 -Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities diff --git a/redhat/applications/adept/adept-14.0.0.spec b/redhat/applications/adept/adept-14.0.0.spec index cc380dc3f..ecadc8de6 100644 --- a/redhat/applications/adept/adept-14.0.0.spec +++ b/redhat/applications/adept/adept-14.0.0.spec @@ -21,11 +21,6 @@ %define tde_version 14.0.0 %endif -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -46,7 +41,7 @@ Name: trinity-%{tde_pkg} Summary: Package management suite for Trinity Version: 2.1.3 -Release: %{?!preversion:3}%{?preversion:2_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:3}%{?preversion:2_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities diff --git a/redhat/applications/adept/adept-3.5.13.2.spec b/redhat/applications/adept/adept-3.5.13.2.spec index ef01e0480..9d9bb6e46 100644 --- a/redhat/applications/adept/adept-3.5.13.2.spec +++ b/redhat/applications/adept/adept-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg adept %define tde_version 3.5.13.2 -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-%{tde_pkg} Summary: Package management suite for Trinity Version: 2.1.3 -Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities diff --git a/redhat/applications/amarok/amarok-14.0.0.spec b/redhat/applications/amarok/amarok-14.0.0.spec index d190185b7..10824b0c7 100644 --- a/redhat/applications/amarok/amarok-14.0.0.spec +++ b/redhat/applications/amarok/amarok-14.0.0.spec @@ -38,7 +38,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 1.4.10 -Release: %{?!preversion:2}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:2}%{?preversion:0_%{preversion}}%{?dist} Summary: Media player for TDE Group: Applications/Multimedia URL: http://www.trinitydesktop.org/ @@ -177,10 +177,13 @@ BuildRequires: libvisual-devel %endif # TUNEPIMP support +%if 0%{?pclinuxos} +BuildRequires: libofa-devel +%endif %if 0%{?mgaversion} && 0%{?mgaversion} <= 2 BuildRequires: libtunepimp-devel %endif -%if 0%{?fedora} || 0%{?mdkversion} || 0%{?suse_version} +%if 0%{?fedora} || 0%{?suse_version} BuildRequires: libtunepimp-devel %endif diff --git a/redhat/applications/amarok/amarok-3.5.13.2.spec b/redhat/applications/amarok/amarok-3.5.13.2.spec index 58764c6de..1b9d9ea3a 100644 --- a/redhat/applications/amarok/amarok-3.5.13.2.spec +++ b/redhat/applications/amarok/amarok-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg amarok %define tde_version 3.5.13.2 -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -26,7 +21,7 @@ Name: trinity-%{tde_pkg} Summary: Media player Version: 1.4.10 -Release: %{?!preversion:12}%{?preversion:11_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:12}%{?preversion:11_%{preversion}}%{?dist} Group: Applications/Multimedia License: GPLv2+ diff --git a/redhat/applications/basket/basket-14.0.0.spec b/redhat/applications/basket/basket-14.0.0.spec index 2dbc9e606..f284a1710 100644 --- a/redhat/applications/basket/basket-14.0.0.spec +++ b/redhat/applications/basket/basket-14.0.0.spec @@ -38,7 +38,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 1.0.3.1 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: Taking care of your ideas Group: Applications/Utilities URL: http://www.trinitydesktop.org/ @@ -139,7 +139,7 @@ export PATH="%{tde_bindir}:${PATH}" # Updates applications categories for openSUSE %if 0%{?suse_version} -%suse_update_desktop_file -G "Extended Clipboard" basket DesktopUtility +%suse_update_desktop_file -G "Extended Clipboard" "%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" DesktopUtility %endif # Apps that should stay in TDE diff --git a/redhat/applications/basket/basket-3.5.13.2.spec b/redhat/applications/basket/basket-3.5.13.2.spec index a44ddd45f..c44573f51 100644 --- a/redhat/applications/basket/basket-3.5.13.2.spec +++ b/redhat/applications/basket/basket-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg basket %define tde_version 3.5.13.2 -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -26,7 +21,7 @@ Name: trinity-%{tde_pkg} Summary: Taking care of your ideas. Version: 1.0.3.1 -Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities diff --git a/redhat/applications/bibletime/bibletime-14.0.0.spec b/redhat/applications/bibletime/bibletime-14.0.0.spec index d6d64f84e..e1bb87942 100644 --- a/redhat/applications/bibletime/bibletime-14.0.0.spec +++ b/redhat/applications/bibletime/bibletime-14.0.0.spec @@ -37,7 +37,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 1.6.6.0 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: A bible study tool for Trinity Group: Applications/Utilities URL: http://www.trinitydesktop.org/ diff --git a/redhat/applications/bibletime/bibletime-3.5.13.2.spec b/redhat/applications/bibletime/bibletime-3.5.13.2.spec index 9a1a1f366..f88ba9285 100644 --- a/redhat/applications/bibletime/bibletime-3.5.13.2.spec +++ b/redhat/applications/bibletime/bibletime-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg bibletime %define tde_version 3.5.13.2 -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -26,7 +21,7 @@ Name: trinity-%{tde_pkg} Summary: A bible study tool for Trinity Version: 1.6.6.0 -Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities diff --git a/redhat/applications/compizconfig-backend-kconfig/compizconfig-backend-kconfig-3.5.12.spec b/redhat/applications/compizconfig-backend-kconfig/compizconfig-backend-kconfig-3.5.12.spec index c21e3fa98..f03034207 100644 --- a/redhat/applications/compizconfig-backend-kconfig/compizconfig-backend-kconfig-3.5.12.spec +++ b/redhat/applications/compizconfig-backend-kconfig/compizconfig-backend-kconfig-3.5.12.spec @@ -7,7 +7,6 @@ # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" -%define _variant .opt %define _docdir %{tde_prefix}/share/doc %endif @@ -19,7 +18,7 @@ BuildRequires: autoconf automake libtool m4 Name: trinity-%{?kdecomp} Version: %{?version} -Release: %{?release}%{?dist}%{?_variant} +Release: %{?release}%{?dist} Vendor: Trinity Project Packager: Francois Andriot <francois.andriot@free.fr> Summary: kconfig backend for compizconfig diff --git a/redhat/applications/digikam/digikam-14.0.0.spec b/redhat/applications/digikam/digikam-14.0.0.spec index 2f322b303..b31c5afaa 100644 --- a/redhat/applications/digikam/digikam-14.0.0.spec +++ b/redhat/applications/digikam/digikam-14.0.0.spec @@ -37,7 +37,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 0.9.6 -Release: %{?!preversion:2}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:2}%{?preversion:0_%{preversion}}%{?dist} Summary: Digital photo management application for TDE Group: Applications/Utilities URL: http://www.trinitydesktop.org/ diff --git a/redhat/applications/digikam/digikam-3.5.13.2.spec b/redhat/applications/digikam/digikam-3.5.13.2.spec index ff084696c..073fa74b6 100644 --- a/redhat/applications/digikam/digikam-3.5.13.2.spec +++ b/redhat/applications/digikam/digikam-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg digikam %define tde_version 3.5.13.2 -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -26,7 +21,7 @@ Name: trinity-%{tde_pkg} Summary: digital photo management application for TDE [Trinity] Version: 0.9.6 -Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities diff --git a/redhat/applications/dolphin/dolphin-14.0.0.spec b/redhat/applications/dolphin/dolphin-14.0.0.spec index 765bb1cca..7406fafec 100644 --- a/redhat/applications/dolphin/dolphin-14.0.0.spec +++ b/redhat/applications/dolphin/dolphin-14.0.0.spec @@ -37,7 +37,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 0.9.2 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: File manager for TDE focusing on usability Group: Applications/Utilities URL: http://www.trinitydesktop.org/ diff --git a/redhat/applications/dolphin/dolphin-3.5.13.2.spec b/redhat/applications/dolphin/dolphin-3.5.13.2.spec index 660674e4e..59db087cc 100644 --- a/redhat/applications/dolphin/dolphin-3.5.13.2.spec +++ b/redhat/applications/dolphin/dolphin-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg dolphin %define tde_version 3.5.13.2 -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -26,7 +21,7 @@ Name: trinity-%{tde_pkg} Summary: File manager for TDE focusing on usability Version: 0.9.2 -Release: %{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities diff --git a/redhat/applications/filelight-l10n/filelight-l10n.spec b/redhat/applications/filelight-l10n/filelight-l10n.spec index 9040a00e9..e21d4b5ac 100644 --- a/redhat/applications/filelight-l10n/filelight-l10n.spec +++ b/redhat/applications/filelight-l10n/filelight-l10n.spec @@ -4,11 +4,6 @@ %define debug_package %{nil} -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE 3.5.13 specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-%{kdecomp} Summary: Localization (l10n) for Filelight, disk space usage tool [Trinity] Version: 1.0 -Release: 2%{?dist}%{?_variant} +Release: 2%{?dist} License: GPLv2+ Group: Applications/Utilities diff --git a/redhat/applications/filelight/filelight-14.0.0.spec b/redhat/applications/filelight/filelight-14.0.0.spec index 837729e47..c5b7d16f0 100644 --- a/redhat/applications/filelight/filelight-14.0.0.spec +++ b/redhat/applications/filelight/filelight-14.0.0.spec @@ -38,7 +38,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 1.0 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: Graphical disk usage display Group: Applications/Utilities URL: http://www.trinitydesktop.org/ diff --git a/redhat/applications/filelight/filelight-3.5.13.2.spec b/redhat/applications/filelight/filelight-3.5.13.2.spec index 154efd222..ecc5790ff 100644 --- a/redhat/applications/filelight/filelight-3.5.13.2.spec +++ b/redhat/applications/filelight/filelight-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg filelight %define tde_version 3.5.13.2 -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -26,7 +21,7 @@ Name: trinity-%{tde_pkg} Summary: Graphical disk usage display Version: 1.0 -Release: %{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities diff --git a/redhat/applications/fusion-icon/fusion-icon-14.0.0.spec b/redhat/applications/fusion-icon/fusion-icon-14.0.0.spec index 9f96d93a0..f1f6a6e53 100644 --- a/redhat/applications/fusion-icon/fusion-icon-14.0.0.spec +++ b/redhat/applications/fusion-icon/fusion-icon-14.0.0.spec @@ -9,11 +9,6 @@ %endif -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -28,7 +23,7 @@ Name: trinity-%{tde_pkg} Summary: tray icon to launch and manage Compiz Fusion [Trinity] Version: 0.0.0+git20071028 -Release: 2%{?dist}%{?_variant} +Release: 2%{?dist} License: GPLv2+ Group: Applications/Utilities diff --git a/redhat/applications/fusion-icon/fusion-icon.spec b/redhat/applications/fusion-icon/fusion-icon.spec index 729590bfe..a15a7b8f1 100644 --- a/redhat/applications/fusion-icon/fusion-icon.spec +++ b/redhat/applications/fusion-icon/fusion-icon.spec @@ -7,11 +7,6 @@ %endif -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -31,7 +26,7 @@ Name: trinity-%{tde_pkg} Summary: tray icon to launch and manage Compiz Fusion [Trinity] Version: 0.0.0+git20071028 -Release: 2%{?dist}%{?_variant} +Release: 2%{?dist} License: GPLv2+ Group: Applications/Utilities diff --git a/redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0.spec b/redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0.spec index cfb763a30..786a319e5 100644 --- a/redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0.spec +++ b/redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0.spec @@ -38,7 +38,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 0.8 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: Theme engine using Qt for GTK+ 2.x and Trinity Group: Applications/Utilities URL: http://www.trinitydesktop.org/ @@ -74,9 +74,13 @@ BuildRequires: libtool # GTK2 support %if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} BuildRequires: gtk2-devel -%else +%endif %if 0%{?mgaversion} >= 5 BuildRequires: %{_lib}gtk+2.0-devel +%endif +%if 0%{?mdkversion} +%if 0%{?pclinuxos} +BuildRequires: %{_lib}gtk+2.0_0-devel %else BuildRequires: gtk+2.0-devel %endif diff --git a/redhat/applications/gtk-qt-engine/gtk-qt-engine-3.5.13.2.spec b/redhat/applications/gtk-qt-engine/gtk-qt-engine-3.5.13.2.spec index cde2e6341..b4b2749c6 100644 --- a/redhat/applications/gtk-qt-engine/gtk-qt-engine-3.5.13.2.spec +++ b/redhat/applications/gtk-qt-engine/gtk-qt-engine-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg gtk-qt-engine %define tde_version 3.5.13.2 -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-%{tde_pkg} Summary: theme engine using Qt for GTK+ 2.x and Trinity Version: 0.8 -Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities diff --git a/redhat/applications/gtk3-tqt-engine/gtk3-tqt-engine-14.0.0.spec b/redhat/applications/gtk3-tqt-engine/gtk3-tqt-engine-14.0.0.spec index 4acb11b0e..bab9c2744 100644 --- a/redhat/applications/gtk3-tqt-engine/gtk3-tqt-engine-14.0.0.spec +++ b/redhat/applications/gtk3-tqt-engine/gtk3-tqt-engine-14.0.0.spec @@ -37,7 +37,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 0.5 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: GTK3 theme engine for TDE Group: Applications/Utilities URL: http://www.trinitydesktop.org/ diff --git a/redhat/applications/gwenview-i18n/gwenview-i18n-14.0.0.spec b/redhat/applications/gwenview-i18n/gwenview-i18n-14.0.0.spec index 63642ddee..c8f336f1f 100644 --- a/redhat/applications/gwenview-i18n/gwenview-i18n-14.0.0.spec +++ b/redhat/applications/gwenview-i18n/gwenview-i18n-14.0.0.spec @@ -38,7 +38,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 1.4.2 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: Internationalization support for Gwenview [Trinity] Group: Applications/Utilities URL: http://www.trinitydesktop.org/ diff --git a/redhat/applications/gwenview-i18n/gwenview-i18n-3.5.13.2.spec b/redhat/applications/gwenview-i18n/gwenview-i18n-3.5.13.2.spec index f9d93019b..bcdcc8187 100644 --- a/redhat/applications/gwenview-i18n/gwenview-i18n-3.5.13.2.spec +++ b/redhat/applications/gwenview-i18n/gwenview-i18n-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg gwenview-i18n %define tde_version 3.5.13.2 -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-%{tde_pkg} Summary: Internationalization support for Gwenview [Trinity] Version: 1.4.2 -Release: %{?!preversion:3}%{?preversion:2_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:3}%{?preversion:2_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities diff --git a/redhat/applications/gwenview/gwenview-14.0.0.spec b/redhat/applications/gwenview/gwenview-14.0.0.spec index 125a8330b..ea0406bbc 100644 --- a/redhat/applications/gwenview/gwenview-14.0.0.spec +++ b/redhat/applications/gwenview/gwenview-14.0.0.spec @@ -38,7 +38,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 1.4.2 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: Gwenview is an image viewer for TDE. Group: Applications/Utilities URL: http://www.trinitydesktop.org/ diff --git a/redhat/applications/gwenview/gwenview-3.5.13.2.spec b/redhat/applications/gwenview/gwenview-3.5.13.2.spec index 9889fe526..9dacfa49a 100644 --- a/redhat/applications/gwenview/gwenview-3.5.13.2.spec +++ b/redhat/applications/gwenview/gwenview-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg gwenview %define tde_version 3.5.13.2 -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-%{tde_pkg} Summary: Gwenview is an image viewer for TDE. Version: 1.4.2 -Release: %{?!preversion:11}%{?preversion:10_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:11}%{?preversion:10_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities diff --git a/redhat/applications/k3b-i18n/k3b-i18n-14.0.0.spec b/redhat/applications/k3b-i18n/k3b-i18n-14.0.0.spec index 6ed144917..7e3716d9a 100644 --- a/redhat/applications/k3b-i18n/k3b-i18n-14.0.0.spec +++ b/redhat/applications/k3b-i18n/k3b-i18n-14.0.0.spec @@ -38,7 +38,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 1.0.5 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: Internationalization support for TDE [Trinity] Group: Applications/Archiving URL: http://www.trinitydesktop.org/ diff --git a/redhat/applications/k3b-i18n/k3b-i18n-3.5.13.2.spec b/redhat/applications/k3b-i18n/k3b-i18n-3.5.13.2.spec index 50ea062cd..c210b1184 100644 --- a/redhat/applications/k3b-i18n/k3b-i18n-3.5.13.2.spec +++ b/redhat/applications/k3b-i18n/k3b-i18n-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg k3n-i18n %define tde_version 3.5.13.2 -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-k3b-i18n Summary: Internationalization support for TDE [Trinity] Version: 1.0.5 -Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist} Vendor: Trinity Project Packager: Francois Andriot <francois.andriot@free.fr> diff --git a/redhat/applications/k3b/k3b-14.0.0.spec b/redhat/applications/k3b/k3b-14.0.0.spec index e5a3aca8b..c153e08d2 100644 --- a/redhat/applications/k3b/k3b-14.0.0.spec +++ b/redhat/applications/k3b/k3b-14.0.0.spec @@ -39,7 +39,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 1.0.5 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: CD/DVD burning application Group: Applications/Archiving URL: http://www.trinitydesktop.org/ diff --git a/redhat/applications/k3b/k3b-3.5.13.2.spec b/redhat/applications/k3b/k3b-3.5.13.2.spec index 052511e2a..5ccd308a2 100644 --- a/redhat/applications/k3b/k3b-3.5.13.2.spec +++ b/redhat/applications/k3b/k3b-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg k3b %define tde_version 3.5.13.2 -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -28,7 +23,7 @@ Name: trinity-%{tde_pkg} Summary: CD/DVD burning application Epoch: 1 Version: 1.0.5 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Vendor: Trinity Project Packager: Francois Andriot <francois.andriot@free.fr> diff --git a/redhat/applications/k9copy/k9copy-14.0.0.spec b/redhat/applications/k9copy/k9copy-14.0.0.spec index 6f4fd1dc2..0d64d4088 100644 --- a/redhat/applications/k9copy/k9copy-14.0.0.spec +++ b/redhat/applications/k9copy/k9copy-14.0.0.spec @@ -38,7 +38,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 1.2.3 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: DVD backup tool for Trinity Group: Applications/Utilities URL: http://www.trinitydesktop.org/ diff --git a/redhat/applications/k9copy/k9copy-3.5.13.2.spec b/redhat/applications/k9copy/k9copy-3.5.13.2.spec index bd6788c62..c1e9495d3 100644 --- a/redhat/applications/k9copy/k9copy-3.5.13.2.spec +++ b/redhat/applications/k9copy/k9copy-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg k9copy %define tde_version 3.5.13.2 -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-%{tde_pkg} Summary: DVD backup tool for Trinity Version: 1.2.3 -Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities diff --git a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-14.0.0.spec b/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-14.0.0.spec index 048d59ec2..60dc16581 100644 --- a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-14.0.0.spec +++ b/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-14.0.0.spec @@ -21,11 +21,6 @@ %define tde_version 14.0.0 %endif -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -46,7 +41,7 @@ Name: trinity-%{tde_pkg} Summary: mozilla plugin that lanches kaffeine for supported media types [Trinity] Version: 0.4.3.1 -Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Multimedia diff --git a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.1.spec b/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.1.spec index 018c2d05b..255ad3c9c 100644 --- a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.1.spec +++ b/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.1.spec @@ -1,11 +1,6 @@ # Default version for this component %define kdecomp kaffeine-mozilla -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE 3.5.13 specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -26,7 +21,7 @@ Name: trinity-%{kdecomp} Summary: mozilla plugin that lanches kaffeine for supported media types [Trinity] Version: 0.4.3.1 -Release: 3%{?dist}%{?_variant} +Release: 3%{?dist} License: GPLv2+ Group: Applications/Multimedia diff --git a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.2.spec b/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.2.spec index 21fc166b0..f49f647cf 100644 --- a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.2.spec +++ b/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg kaffeine-mozilla %define tde_version 3.5.13.2 -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-%{tde_pkg} Summary: mozilla plugin that lanches kaffeine for supported media types [Trinity] Version: 0.4.3.1 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Multimedia diff --git a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.spec b/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.spec index dfbc6152d..4da845d7d 100644 --- a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.spec +++ b/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.spec @@ -1,11 +1,6 @@ # Default version for this component %define kdecomp kaffeine-mozilla -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE 3.5.13 specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -26,7 +21,7 @@ Name: trinity-%{kdecomp} Summary: mozilla plugin that lanches kaffeine for supported media types [Trinity] Version: 0.4.3.1 -Release: 2%{?dist}%{?_variant} +Release: 2%{?dist} License: GPLv2+ Group: Applications/Multimedia diff --git a/redhat/applications/kaffeine/kaffeine-14.0.0.spec b/redhat/applications/kaffeine/kaffeine-14.0.0.spec index 857e998ee..06478dcc8 100644 --- a/redhat/applications/kaffeine/kaffeine-14.0.0.spec +++ b/redhat/applications/kaffeine/kaffeine-14.0.0.spec @@ -38,7 +38,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 0.8.8 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: Xine-based media player Group: Applications/Multimedia URL: http://kaffeine.sourceforge.net/ diff --git a/redhat/applications/kaffeine/kaffeine-3.5.13.2.spec b/redhat/applications/kaffeine/kaffeine-3.5.13.2.spec index 298618821..50fcf40b7 100644 --- a/redhat/applications/kaffeine/kaffeine-3.5.13.2.spec +++ b/redhat/applications/kaffeine/kaffeine-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg kaffeine %define tde_version 3.5.13.2 -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -26,7 +21,7 @@ Name: trinity-%{tde_pkg} Summary: Xine-based media player Version: 0.8.8 -Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Multimedia diff --git a/redhat/applications/kasablanca/kasablanca-14.0.0.spec b/redhat/applications/kasablanca/kasablanca-14.0.0.spec index b5f2cc11a..960b5295c 100644 --- a/redhat/applications/kasablanca/kasablanca-14.0.0.spec +++ b/redhat/applications/kasablanca/kasablanca-14.0.0.spec @@ -38,7 +38,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 0.4.0.2 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: Graphical FTP client for Trinity Group: Applications/Internet Url: http://kasablanca.berlios.de/ diff --git a/redhat/applications/katapult/katapult-14.0.0.spec b/redhat/applications/katapult/katapult-14.0.0.spec index 45ed9866b..a50e091d0 100644 --- a/redhat/applications/katapult/katapult-14.0.0.spec +++ b/redhat/applications/katapult/katapult-14.0.0.spec @@ -38,7 +38,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 0.3.2.1 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: Faster access to applications, bookmarks, and other items. Group: Applications/Utilities URL: http://www.trinitydesktop.org/ diff --git a/redhat/applications/katapult/katapult-3.5.13.2.spec b/redhat/applications/katapult/katapult-3.5.13.2.spec index 20afee2a5..0176acedb 100644 --- a/redhat/applications/katapult/katapult-3.5.13.2.spec +++ b/redhat/applications/katapult/katapult-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg katapult %define tde_version 3.5.13.2 -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-%{tde_pkg} Summary: Faster access to applications, bookmarks, and other items. Version: 0.3.2.1 -Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities diff --git a/redhat/applications/kbarcode/kbarcode-14.0.0.spec b/redhat/applications/kbarcode/kbarcode-14.0.0.spec index 9d5d4dc53..d356e20c0 100644 --- a/redhat/applications/kbarcode/kbarcode-14.0.0.spec +++ b/redhat/applications/kbarcode/kbarcode-14.0.0.spec @@ -38,7 +38,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 2.0.7 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: barcode and label printing application for Trinity Group: Applications/Utilities URL: http://www.kbarcode.net diff --git a/redhat/applications/kbarcode/kbarcode-3.5.13.2.spec b/redhat/applications/kbarcode/kbarcode-3.5.13.2.spec index 24a59f391..19761fcaa 100644 --- a/redhat/applications/kbarcode/kbarcode-3.5.13.2.spec +++ b/redhat/applications/kbarcode/kbarcode-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg kbarcode %define tde_version 3.5.13.2 -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-%{tde_pkg} Summary: barcode and label printing application for Trinity Version: 2.0.6 -Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities diff --git a/redhat/applications/kbfx/kbfx-14.0.0.spec b/redhat/applications/kbfx/kbfx-14.0.0.spec index 215350246..4de3ed244 100644 --- a/redhat/applications/kbfx/kbfx-14.0.0.spec +++ b/redhat/applications/kbfx/kbfx-14.0.0.spec @@ -38,7 +38,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 0.4.9.3.1 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: An alternative to K-Menu for TDE Group: Applications/Utilities URL: http://www.trinitydesktop.org/ diff --git a/redhat/applications/kbfx/kbfx-3.5.13.2.spec b/redhat/applications/kbfx/kbfx-3.5.13.2.spec index 0af953f7d..60783abea 100644 --- a/redhat/applications/kbfx/kbfx-3.5.13.2.spec +++ b/redhat/applications/kbfx/kbfx-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg kbfx %define tde_version 3.5.13.2 -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-%{tde_pkg} Summary: an alternative to K-Menu for TDE [Trinity] Version: 0.4.9.3.1 -Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities diff --git a/redhat/applications/kbibtex/kbibtex-14.0.0.spec b/redhat/applications/kbibtex/kbibtex-14.0.0.spec index e5f62dd00..57d87da54 100644 --- a/redhat/applications/kbibtex/kbibtex-14.0.0.spec +++ b/redhat/applications/kbibtex/kbibtex-14.0.0.spec @@ -38,7 +38,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 0.2.3 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: A BibTeX editor for TDE Group: Applications/Internet URL: http://www.unix-ag.uni-kl.de/~fischer/kbibtex/download.html diff --git a/redhat/applications/kbiff/kbiff-14.0.0.spec b/redhat/applications/kbiff/kbiff-14.0.0.spec index 6e424d7bd..8f8c9eecb 100644 --- a/redhat/applications/kbiff/kbiff-14.0.0.spec +++ b/redhat/applications/kbiff/kbiff-14.0.0.spec @@ -38,7 +38,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 3.9 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: TDE mail notification utility Group: Applications/Internet URL: http://www.trinitydesktop.org/ diff --git a/redhat/applications/kbookreader/kbookreader-14.0.0.spec b/redhat/applications/kbookreader/kbookreader-14.0.0.spec index 2f6e749bd..c4790d8e8 100644 --- a/redhat/applications/kbookreader/kbookreader-14.0.0.spec +++ b/redhat/applications/kbookreader/kbookreader-14.0.0.spec @@ -38,7 +38,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 0.2.0 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: eBook reader for Trinity Group: Applications/Utilities URL: http://www.trinitydesktop.org/ diff --git a/redhat/applications/kbookreader/kbookreader-3.5.13.2.spec b/redhat/applications/kbookreader/kbookreader-3.5.13.2.spec index e538652b3..cfa6891f7 100644 --- a/redhat/applications/kbookreader/kbookreader-3.5.13.2.spec +++ b/redhat/applications/kbookreader/kbookreader-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg kbookreader %define tde_version 3.5.13.2 -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-%{tde_pkg} Summary: eBook reader for Trinity. Version: 0.2.0 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities diff --git a/redhat/applications/kchmviewer/kchmviewer-14.0.0.spec b/redhat/applications/kchmviewer/kchmviewer-14.0.0.spec index e66ea3bc4..c96594317 100644 --- a/redhat/applications/kchmviewer/kchmviewer-14.0.0.spec +++ b/redhat/applications/kchmviewer/kchmviewer-14.0.0.spec @@ -38,7 +38,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 3.1.2 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: CHM viewer for Trinity Group: Applications/Utilities URL: http://www.trinitydesktop.org/ diff --git a/redhat/applications/kchmviewer/kchmviewer-3.5.13.2.spec b/redhat/applications/kchmviewer/kchmviewer-3.5.13.2.spec index b8e6589e2..9f63f916c 100644 --- a/redhat/applications/kchmviewer/kchmviewer-3.5.13.2.spec +++ b/redhat/applications/kchmviewer/kchmviewer-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg kchmviewer %define tde_version 3.5.13.2 -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-%{tde_pkg} Summary: CHM viewer for Trinity Version: 3.1.2 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities diff --git a/redhat/applications/kcmautostart/kcmautostart-14.0.0.spec b/redhat/applications/kcmautostart/kcmautostart-14.0.0.spec index 0fdd5c9d9..d61b6e0f2 100644 --- a/redhat/applications/kcmautostart/kcmautostart-14.0.0.spec +++ b/redhat/applications/kcmautostart/kcmautostart-14.0.0.spec @@ -38,7 +38,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 1.0 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: Manage applications automatic startup Group: Applications/Utilities URL: http://www.trinitydesktop.org/ diff --git a/redhat/applications/kcmautostart/kcmautostart-3.5.13.2.spec b/redhat/applications/kcmautostart/kcmautostart-3.5.13.2.spec index 9374347cc..3b88343b3 100644 --- a/redhat/applications/kcmautostart/kcmautostart-3.5.13.2.spec +++ b/redhat/applications/kcmautostart/kcmautostart-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg kchmviewer %define tde_version 3.5.13.2 -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-kcmautostart Summary: Manage applications automatic startup. Version: 1.0 -Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities diff --git a/redhat/applications/kcmldap/kcmldap-14.0.0.spec b/redhat/applications/kcmldap/kcmldap-14.0.0.spec index 7260ccee2..cc34e6c29 100644 --- a/redhat/applications/kcmldap/kcmldap-14.0.0.spec +++ b/redhat/applications/kcmldap/kcmldap-14.0.0.spec @@ -38,7 +38,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 0.5 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: Kerberos control module for the TDE control center Group: Applications/Utilities URL: http://www.trinitydesktop.org/ diff --git a/redhat/applications/kcmldapcontroller/kcmldapcontroller-14.0.0.spec b/redhat/applications/kcmldapcontroller/kcmldapcontroller-14.0.0.spec index 27a7f09ba..abe68b895 100644 --- a/redhat/applications/kcmldapcontroller/kcmldapcontroller-14.0.0.spec +++ b/redhat/applications/kcmldapcontroller/kcmldapcontroller-14.0.0.spec @@ -37,7 +37,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 0.5 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: Kerberos control module for the TDE control center Group: Applications/Utilities URL: http://www.trinitydesktop.org/ diff --git a/redhat/applications/kcmldapmanager/kcmldapmanager-14.0.0.spec b/redhat/applications/kcmldapmanager/kcmldapmanager-14.0.0.spec index 0d9d75521..cfd226fe1 100644 --- a/redhat/applications/kcmldapmanager/kcmldapmanager-14.0.0.spec +++ b/redhat/applications/kcmldapmanager/kcmldapmanager-14.0.0.spec @@ -37,7 +37,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 0.5 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: Kerberos control module for the TDE control center Group: Applications/Utilities URL: http://www.trinitydesktop.org/ diff --git a/redhat/applications/kcpuload/kcpuload-14.0.0.spec b/redhat/applications/kcpuload/kcpuload-14.0.0.spec index 004fb1245..641b406b8 100644 --- a/redhat/applications/kcpuload/kcpuload-14.0.0.spec +++ b/redhat/applications/kcpuload/kcpuload-14.0.0.spec @@ -37,7 +37,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 2.00 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: CPU meter for Kicker [Trinity] Group: Applications/Utilities URL: http://www.trinitydesktop.org/ diff --git a/redhat/applications/kcpuload/kcpuload-3.5.13.2.spec b/redhat/applications/kcpuload/kcpuload-3.5.13.2.spec index a5374081e..d6b24343e 100644 --- a/redhat/applications/kcpuload/kcpuload-3.5.13.2.spec +++ b/redhat/applications/kcpuload/kcpuload-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg kcpuload %define tde_version 3.5.13.2 -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-%{tde_pkg} Summary: a CPU meter for Kicker [Trinity] Version: 2.00 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities diff --git a/redhat/applications/kdbg/kdbg-14.0.0.spec b/redhat/applications/kdbg/kdbg-14.0.0.spec index 4eed8e069..3276355b3 100644 --- a/redhat/applications/kdbg/kdbg-14.0.0.spec +++ b/redhat/applications/kdbg/kdbg-14.0.0.spec @@ -38,7 +38,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 2.2.2 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: Graphical debugger interface [Trinity] Group: Applications/Utilities URL: http://www.trinitydesktop.org/ diff --git a/redhat/applications/kdbusnotification/kdbusnotification-14.0.0.spec b/redhat/applications/kdbusnotification/kdbusnotification-14.0.0.spec index 78183f840..ccbe39832 100644 --- a/redhat/applications/kdbusnotification/kdbusnotification-14.0.0.spec +++ b/redhat/applications/kdbusnotification/kdbusnotification-14.0.0.spec @@ -36,7 +36,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 0.1 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: a DBUS notification service [Trinity] Group: Applications/Utilities URL: http://www.trinitydesktop.org/ diff --git a/redhat/applications/kdbusnotification/kdbusnotification-3.5.13.2.spec b/redhat/applications/kdbusnotification/kdbusnotification-3.5.13.2.spec index 521f14897..be730e756 100644 --- a/redhat/applications/kdbusnotification/kdbusnotification-3.5.13.2.spec +++ b/redhat/applications/kdbusnotification/kdbusnotification-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg kdbusnotification %define tde_version 3.5.13.2 -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -28,7 +23,7 @@ Name: trinity-%{tde_pkg} Summary: a DBUS notification service [Trinity] Version: 0.1 -Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities diff --git a/redhat/applications/kdiff3/kdiff3-14.0.0.spec b/redhat/applications/kdiff3/kdiff3-14.0.0.spec index 635846618..b270ca5c9 100644 --- a/redhat/applications/kdiff3/kdiff3-14.0.0.spec +++ b/redhat/applications/kdiff3/kdiff3-14.0.0.spec @@ -37,7 +37,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 0.9.91 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: KDiff3 is a utility for comparing and/or merging two or three text files or directories. Group: Applications/Utilities URL: http://www.trinitydesktop.org/ diff --git a/redhat/applications/kdiff3/kdiff3-3.5.13.2.spec b/redhat/applications/kdiff3/kdiff3-3.5.13.2.spec index 92c2bf2a8..b1824f49f 100644 --- a/redhat/applications/kdiff3/kdiff3-3.5.13.2.spec +++ b/redhat/applications/kdiff3/kdiff3-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg kdiff3 %define tde_version 3.5.13.2 -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-%{tde_pkg} Summary: KDiff3 is a utility for comparing and/or merging two or three text files or directories. Version: 0.9.91 -Release: %{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities diff --git a/redhat/applications/kdirstat/kdirstat-14.0.0.spec b/redhat/applications/kdirstat/kdirstat-14.0.0.spec index 6ce0f694f..05a2e5738 100644 --- a/redhat/applications/kdirstat/kdirstat-14.0.0.spec +++ b/redhat/applications/kdirstat/kdirstat-14.0.0.spec @@ -36,7 +36,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 2.4.4 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: Graphical disk usage display with cleanup facilities [Trinity] Group: Applications/Utilities URL: http://www.trinitydesktop.org diff --git a/redhat/applications/kdirstat/kdirstat-3.5.13.2.spec b/redhat/applications/kdirstat/kdirstat-3.5.13.2.spec index be40fd152..f40570baf 100644 --- a/redhat/applications/kdirstat/kdirstat-3.5.13.2.spec +++ b/redhat/applications/kdirstat/kdirstat-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg kdirstat %define tde_version 3.5.13.2 -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-%{tde_pkg} Summary: graphical disk usage display with cleanup facilities [Trinity] Version: 2.4.4 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities diff --git a/redhat/applications/keep/keep-14.0.0.spec b/redhat/applications/keep/keep-14.0.0.spec index a92c3baa1..589c0e560 100644 --- a/redhat/applications/keep/keep-14.0.0.spec +++ b/redhat/applications/keep/keep-14.0.0.spec @@ -37,7 +37,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 0.4.0 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: Backup system for TDE [Trinity] Group: Applications/Utilities URL: http://www.trinitydesktop.org/ @@ -137,7 +137,7 @@ export PATH="%{tde_bindir}:${PATH}" # Updates applications categories for openSUSE %if 0%{?suse_version} -%suse_update_desktop_file -r "keep" System Backup +%suse_update_desktop_file -r "%{?buildroot}%{tde_tdeappdir}/keep.desktop" System Backup %endif diff --git a/redhat/applications/keep/keep-3.5.13.2.spec b/redhat/applications/keep/keep-3.5.13.2.spec index c8b439979..db27e55eb 100644 --- a/redhat/applications/keep/keep-3.5.13.2.spec +++ b/redhat/applications/keep/keep-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg keep %define tde_version 3.5.13.2 -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-%{tde_pkg} Summary: backup system for TDE [Trinity] Version: 0.4.0 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities diff --git a/redhat/applications/kerberostray/kerberostray-14.0.0.spec b/redhat/applications/kerberostray/kerberostray-14.0.0.spec index a0d4f780b..208f7c3e8 100644 --- a/redhat/applications/kerberostray/kerberostray-14.0.0.spec +++ b/redhat/applications/kerberostray/kerberostray-14.0.0.spec @@ -37,7 +37,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 0.5 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: Kerberos ticket manager Group: Applications/Utilities URL: http://www.trinitydesktop.org/ diff --git a/redhat/applications/kerry/kerry-14.0.0.spec b/redhat/applications/kerry/kerry-14.0.0.spec index dd93efea6..887f42eb5 100644 --- a/redhat/applications/kerry/kerry-14.0.0.spec +++ b/redhat/applications/kerry/kerry-14.0.0.spec @@ -21,11 +21,6 @@ %define tde_version 14.0.0 %endif -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -46,7 +41,7 @@ Name: trinity-%{tde_pkg} Summary: a TDE frontend for the Beagle desktop search daemon [Trinity] Version: 0.2.1 -Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities diff --git a/redhat/applications/kerry/kerry-3.5.13.1.spec b/redhat/applications/kerry/kerry-3.5.13.1.spec index 9bc265341..6dcd58b9c 100644 --- a/redhat/applications/kerry/kerry-3.5.13.1.spec +++ b/redhat/applications/kerry/kerry-3.5.13.1.spec @@ -1,11 +1,6 @@ # Default version for this component %define kdecomp kerry -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE 3.5.13 specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -26,7 +21,7 @@ Name: trinity-%{kdecomp} Summary: a KDE frontend for the Beagle desktop search daemon [Trinity] Version: 0.2.1 -Release: 2%{?dist}%{?_variant} +Release: 2%{?dist} License: GPLv2+ Group: Applications/Utilities diff --git a/redhat/applications/kerry/kerry-3.5.13.2.spec b/redhat/applications/kerry/kerry-3.5.13.2.spec index 09949032e..681761c48 100644 --- a/redhat/applications/kerry/kerry-3.5.13.2.spec +++ b/redhat/applications/kerry/kerry-3.5.13.2.spec @@ -1,11 +1,6 @@ # Default version for this component %define tdecomp kerry -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE 3.5.13 specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -26,7 +21,7 @@ Name: trinity-%{tdecomp} Summary: a KDE frontend for the Beagle desktop search daemon [Trinity] Version: 0.2.1 -Release: 3%{?dist}%{?_variant} +Release: 3%{?dist} License: GPLv2+ Group: Applications/Utilities diff --git a/redhat/applications/kerry/kerry-3.5.13.spec b/redhat/applications/kerry/kerry-3.5.13.spec index 49b070395..3719aeb98 100644 --- a/redhat/applications/kerry/kerry-3.5.13.spec +++ b/redhat/applications/kerry/kerry-3.5.13.spec @@ -1,11 +1,6 @@ # Default version for this component %define kdecomp kerry -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE 3.5.13 specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -26,7 +21,7 @@ Name: trinity-%{kdecomp} Summary: a KDE frontend for the Beagle desktop search daemon [Trinity] Version: 0.2.1 -Release: 1%{?dist}%{?_variant} +Release: 1%{?dist} License: GPLv2+ Group: Applications/Utilities diff --git a/redhat/applications/kftpgrabber/kftpgrabber-14.0.0.spec b/redhat/applications/kftpgrabber/kftpgrabber-14.0.0.spec index b6f228243..e9ce36086 100644 --- a/redhat/applications/kftpgrabber/kftpgrabber-14.0.0.spec +++ b/redhat/applications/kftpgrabber/kftpgrabber-14.0.0.spec @@ -37,7 +37,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 0.8.1 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: A FTP client for TDE. Group: Applications/Internet URL: http://www.kftp.org/ diff --git a/redhat/applications/kgtk-qt3/kgtk-qt3-14.0.0.spec b/redhat/applications/kgtk-qt3/kgtk-qt3-14.0.0.spec index a4b42d041..60c250049 100644 --- a/redhat/applications/kgtk-qt3/kgtk-qt3-14.0.0.spec +++ b/redhat/applications/kgtk-qt3/kgtk-qt3-14.0.0.spec @@ -37,7 +37,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 0.10.2 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: Use TDE dialogs in Gtk apps Group: Applications/Utilities URL: http://www.trinitydesktop.org diff --git a/redhat/applications/kgtk-qt3/kgtk-qt3-3.5.13.2.spec b/redhat/applications/kgtk-qt3/kgtk-qt3-3.5.13.2.spec index 6e75780c7..2c7154c59 100644 --- a/redhat/applications/kgtk-qt3/kgtk-qt3-3.5.13.2.spec +++ b/redhat/applications/kgtk-qt3/kgtk-qt3-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg kgtk-qt3 %define tde_version 3.5.13.2 -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-%{tde_pkg} Summary: Use TDE dialogs in Gtk apps Version: 0.10.2 -Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities diff --git a/redhat/applications/kile/kile-14.0.0.spec b/redhat/applications/kile/kile-14.0.0.spec index b7763b129..423846406 100644 --- a/redhat/applications/kile/kile-14.0.0.spec +++ b/redhat/applications/kile/kile-14.0.0.spec @@ -37,7 +37,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 2.0.3 -Release: %{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist} Summary: TDE Integrated LaTeX Environment [Trinity] Group: Applications/Publishing URL: http://www.trinitydesktop.org/ diff --git a/redhat/applications/kile/kile-3.5.13.2.spec b/redhat/applications/kile/kile-3.5.13.2.spec index 320b18726..b36653c4e 100644 --- a/redhat/applications/kile/kile-3.5.13.2.spec +++ b/redhat/applications/kile/kile-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg kile %define tde_version 3.5.13.2 -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-%{tde_pkg} Summary: TDE Integrated LaTeX Environment [Trinity] Version: 2.0.2 -Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Publishing diff --git a/redhat/applications/kima/kima-14.0.0.spec b/redhat/applications/kima/kima-14.0.0.spec index e1516f424..fd1db9419 100644 --- a/redhat/applications/kima/kima-14.0.0.spec +++ b/redhat/applications/kima/kima-14.0.0.spec @@ -38,7 +38,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 0.7.3.2 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: Kicker monitoring applet [Trinity] Group: Applications/Utilities URL: http://www.elliptique.net/~ken/kima/ diff --git a/redhat/applications/kima/kima-3.5.13.2.spec b/redhat/applications/kima/kima-3.5.13.2.spec index 840d1c1bf..0ccd373f8 100644 --- a/redhat/applications/kima/kima-3.5.13.2.spec +++ b/redhat/applications/kima/kima-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg kima %define tde_version 3.5.13.2 -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-%{tde_pkg} Summary: kicker monitoring applet [Trinity] Version: 0.7.3.2 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities diff --git a/redhat/applications/kiosktool/kiosktool-14.0.0.spec b/redhat/applications/kiosktool/kiosktool-14.0.0.spec index 0354c3f79..381e5c2a7 100644 --- a/redhat/applications/kiosktool/kiosktool-14.0.0.spec +++ b/redhat/applications/kiosktool/kiosktool-14.0.0.spec @@ -39,7 +39,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 1.0 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: Tool to configure the TDE kiosk framework Group: Applications/Multimedia URL: http://www.trinitydesktop.org/ diff --git a/redhat/applications/kiosktool/kiosktool-3.5.13.2.spec b/redhat/applications/kiosktool/kiosktool-3.5.13.2.spec index d37887fe3..aefefab4d 100644 --- a/redhat/applications/kiosktool/kiosktool-3.5.13.2.spec +++ b/redhat/applications/kiosktool/kiosktool-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg kiosktool %define tde_version 3.5.13.2 -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -26,7 +21,7 @@ Name: trinity-%{tde_pkg} Version: 1.0 -Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist} Summary: tool to configure the TDE kiosk framework License: GPLv2+ diff --git a/redhat/applications/kkbswitch/kkbswitch-14.0.0.spec b/redhat/applications/kkbswitch/kkbswitch-14.0.0.spec index 2628b2f53..4c017d56d 100644 --- a/redhat/applications/kkbswitch/kkbswitch-14.0.0.spec +++ b/redhat/applications/kkbswitch/kkbswitch-14.0.0.spec @@ -38,7 +38,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 1.4.3 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: Keyboard layout indicator for TDE Group: Applications/Utilities URL: http://www.trinitydesktop.org/ diff --git a/redhat/applications/klcddimmer/klcddimmer-14.0.0.spec b/redhat/applications/klcddimmer/klcddimmer-14.0.0.spec index d13b32723..68acdf26d 100644 --- a/redhat/applications/klcddimmer/klcddimmer-14.0.0.spec +++ b/redhat/applications/klcddimmer/klcddimmer-14.0.0.spec @@ -38,7 +38,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 0.3 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: Applet to adjust LCD brightness for TDE Group: Applications/Utilities URL: http://www.trinitydesktop.org/ diff --git a/redhat/applications/kmplayer/kmplayer-14.0.0.spec b/redhat/applications/kmplayer/kmplayer-14.0.0.spec index f19972c3b..7caf83cf4 100644 --- a/redhat/applications/kmplayer/kmplayer-14.0.0.spec +++ b/redhat/applications/kmplayer/kmplayer-14.0.0.spec @@ -38,7 +38,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 0.10.0c -Release: %{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist} Summary: Media player for Trinity Group: Applications/Multimedia URL: http://www.trinitydesktop.org/ diff --git a/redhat/applications/kmplayer/kmplayer-3.5.13.2.spec b/redhat/applications/kmplayer/kmplayer-3.5.13.2.spec index a919c6023..81a03d8b1 100644 --- a/redhat/applications/kmplayer/kmplayer-3.5.13.2.spec +++ b/redhat/applications/kmplayer/kmplayer-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg kmplayer %define tde_version 3.5.13.2 -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-%{tde_pkg} Summary: media player for Trinity Version: 0.10.0c -Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Multimedia diff --git a/redhat/applications/kmyfirewall/kmyfirewall-14.0.0.spec b/redhat/applications/kmyfirewall/kmyfirewall-14.0.0.spec index 90bdf9d0f..6e50cb226 100644 --- a/redhat/applications/kmyfirewall/kmyfirewall-14.0.0.spec +++ b/redhat/applications/kmyfirewall/kmyfirewall-14.0.0.spec @@ -38,7 +38,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 1.1.1 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: Iptables based firewall configuration tool for TDE Group: Applications/Utilities URL: http://www.trinitydesktop.org/ diff --git a/redhat/applications/kmyfirewall/kmyfirewall-3.5.13.2.spec b/redhat/applications/kmyfirewall/kmyfirewall-3.5.13.2.spec index 2bb53f516..c5a98d4f0 100644 --- a/redhat/applications/kmyfirewall/kmyfirewall-3.5.13.2.spec +++ b/redhat/applications/kmyfirewall/kmyfirewall-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg kmyfirewall %define tde_version 3.5.13.2 -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-%{tde_pkg} Summary: iptables based firewall configuration tool for TDE [Trinity] Version: 1.1.1 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities diff --git a/redhat/applications/kmymoney/kmymoney-14.0.0.spec b/redhat/applications/kmymoney/kmymoney-14.0.0.spec index da75f202a..59d424271 100644 --- a/redhat/applications/kmymoney/kmymoney-14.0.0.spec +++ b/redhat/applications/kmymoney/kmymoney-14.0.0.spec @@ -39,7 +39,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 1.0.5 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: Personal finance manager for TDE Group: Applications/Utilities URL: http://www.trinitydesktop.org/ diff --git a/redhat/applications/kmymoney/kmymoney-3.5.13.2.spec b/redhat/applications/kmymoney/kmymoney-3.5.13.2.spec index acb5a1905..ed9b2a430 100644 --- a/redhat/applications/kmymoney/kmymoney-3.5.13.2.spec +++ b/redhat/applications/kmymoney/kmymoney-3.5.13.2.spec @@ -15,11 +15,6 @@ %define qt3pluginsdir /usr/lib/qt3/plugins %endif -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -41,7 +36,7 @@ Name: trinity-%{tde_pkg} Summary: personal finance manager for TDE Version: 1.0.5 -Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities diff --git a/redhat/applications/knemo/knemo-14.0.0.spec b/redhat/applications/knemo/knemo-14.0.0.spec index 1f104eaf7..fab1fd5f3 100644 --- a/redhat/applications/knemo/knemo-14.0.0.spec +++ b/redhat/applications/knemo/knemo-14.0.0.spec @@ -37,7 +37,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 0.4.8 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: Network interfaces monitor for the Trinity systray Group: Applications/Utilities URL: http://www.trinitydesktop.org/ diff --git a/redhat/applications/knemo/knemo-3.5.13.2.spec b/redhat/applications/knemo/knemo-3.5.13.2.spec index cbad92895..232647b18 100644 --- a/redhat/applications/knemo/knemo-3.5.13.2.spec +++ b/redhat/applications/knemo/knemo-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg knemo %define tde_version 3.5.13.2 -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-%{tde_pkg} Summary: network interfaces monitor for the Trinity systray Version: 0.4.8 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities diff --git a/redhat/applications/knetload/knetload-14.0.0.spec b/redhat/applications/knetload/knetload-14.0.0.spec index 8a63f76ec..938e64d8e 100644 --- a/redhat/applications/knetload/knetload-14.0.0.spec +++ b/redhat/applications/knetload/knetload-14.0.0.spec @@ -37,7 +37,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 2.3 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: A network meter for Kicker [Trinity] Group: Applications/Utilities URL: http://www.trinitydesktop.org diff --git a/redhat/applications/knetload/knetload-3.5.13.2.spec b/redhat/applications/knetload/knetload-3.5.13.2.spec index 99fd0807b..97a1b3b05 100644 --- a/redhat/applications/knetload/knetload-3.5.13.2.spec +++ b/redhat/applications/knetload/knetload-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg knetload %define tde_version 3.5.13.2 -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-%{tde_pkg} Summary: a network meter for Kicker [Trinity] Version: 2.3 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities diff --git a/redhat/applications/knetstats/knetstats-14.0.0.spec b/redhat/applications/knetstats/knetstats-14.0.0.spec index 180664256..b8c12e25a 100644 --- a/redhat/applications/knetstats/knetstats-14.0.0.spec +++ b/redhat/applications/knetstats/knetstats-14.0.0.spec @@ -37,7 +37,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 1.6.1 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: Network interfaces monitor for the Trinity systray Group: Applications/Utilities URL: http://www.trinitydesktop.org diff --git a/redhat/applications/knetstats/knetstats-3.5.13.2.spec b/redhat/applications/knetstats/knetstats-3.5.13.2.spec index af57bf9ca..8711affce 100644 --- a/redhat/applications/knetstats/knetstats-3.5.13.2.spec +++ b/redhat/applications/knetstats/knetstats-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg knetstats %define tde_version 3.5.13.2 -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-%{tde_pkg} Summary: network interfaces monitor for the Trinity systray Version: 1.6.1 -Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities diff --git a/redhat/applications/knetworkmanager8/knetworkmanager8-14.0.0.spec b/redhat/applications/knetworkmanager8/knetworkmanager8-14.0.0.spec index 05b9c8ee1..05fd5ab1f 100644 --- a/redhat/applications/knetworkmanager8/knetworkmanager8-14.0.0.spec +++ b/redhat/applications/knetworkmanager8/knetworkmanager8-14.0.0.spec @@ -37,7 +37,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 0.8 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: Trinity applet for Network Manager Group: Applications/Internet URL: http://www.trinitydesktop.org/ diff --git a/redhat/applications/knetworkmanager8/knetworkmanager8-3.5.13.2.spec b/redhat/applications/knetworkmanager8/knetworkmanager8-3.5.13.2.spec index 77bc5600c..de3d53c04 100644 --- a/redhat/applications/knetworkmanager8/knetworkmanager8-3.5.13.2.spec +++ b/redhat/applications/knetworkmanager8/knetworkmanager8-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg knetworkmanager8 %define tde_version 3.5.13.2 -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -26,7 +21,7 @@ Name: trinity-%{tde_pkg} Version: 0.8 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} Summary: Trinity applet for Network Manager diff --git a/redhat/applications/knights/knights-14.0.0.spec b/redhat/applications/knights/knights-14.0.0.spec index 56e74f3e3..81644992e 100644 --- a/redhat/applications/knights/knights-14.0.0.spec +++ b/redhat/applications/knights/knights-14.0.0.spec @@ -37,7 +37,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 0.6 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: A chess interface for the K Desktop Environment [Trinity] Group: Amusements/Games URL: http://www.trinitydesktop.org/ diff --git a/redhat/applications/knights/knights-3.5.13.2.spec b/redhat/applications/knights/knights-3.5.13.2.spec index a203605a9..f3d135f6f 100644 --- a/redhat/applications/knights/knights-3.5.13.2.spec +++ b/redhat/applications/knights/knights-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg knights %define tde_version 3.5.13.2 -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-%{tde_pkg} Summary: A chess interface for the K Desktop Environment [Trinity] Version: 0.6 -Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist} License: GPLv2+ Group: Amusements/Games diff --git a/redhat/applications/knmap/knmap-14.0.0.spec b/redhat/applications/knmap/knmap-14.0.0.spec index 5e72247f8..d7fe3dd1a 100644 --- a/redhat/applications/knmap/knmap-14.0.0.spec +++ b/redhat/applications/knmap/knmap-14.0.0.spec @@ -37,7 +37,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 2.1 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: An NMAP frontend for TDE Group: Applications/Internet URL: http://sourceforge.net/projects/knmap/ diff --git a/redhat/applications/knowit/knowit-14.0.0.spec b/redhat/applications/knowit/knowit-14.0.0.spec index bf5bf113c..eb870c0fc 100644 --- a/redhat/applications/knowit/knowit-14.0.0.spec +++ b/redhat/applications/knowit/knowit-14.0.0.spec @@ -37,7 +37,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 0.10 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: Tool for managing notes [Trinity] Group: Applications/Utilities URL: http://www.trinitydesktop.org diff --git a/redhat/applications/knowit/knowit-3.5.13.2.spec b/redhat/applications/knowit/knowit-3.5.13.2.spec index 4b8dd9f47..73812df0f 100644 --- a/redhat/applications/knowit/knowit-3.5.13.2.spec +++ b/redhat/applications/knowit/knowit-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg knowit %define tde_version 3.5.13.2 -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-%{tde_pkg} Summary: Tool for managing notes [Trinity] Version: 0.10 -Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities diff --git a/redhat/applications/knutclient/knutclient-14.0.0.spec b/redhat/applications/knutclient/knutclient-14.0.0.spec index 5e86bdec1..bc9de3983 100644 --- a/redhat/applications/knutclient/knutclient-14.0.0.spec +++ b/redhat/applications/knutclient/knutclient-14.0.0.spec @@ -37,7 +37,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 0.9.5 -Release: %{?!preversion:0}%{?preversion:1_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:0}%{?preversion:1_%{preversion}}%{?dist} Summary: A TDE GUI that displays UPS statistics from NUT's upsd [Trinity] Group: Applications/Utilities URL: http://www.knut.noveradsl.cz/knutclient/ diff --git a/redhat/applications/knutclient/knutclient-3.5.13.2.spec b/redhat/applications/knutclient/knutclient-3.5.13.2.spec index 6be2584e8..e026cb05c 100644 --- a/redhat/applications/knutclient/knutclient-3.5.13.2.spec +++ b/redhat/applications/knutclient/knutclient-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg knutclient %define tde_version 3.5.13.2 -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-%{tde_pkg} Summary: A TDE GUI that displays UPS statistics from NUT's upsd [Trinity] Version: 0.9.5 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities diff --git a/redhat/applications/koffice-i18n/koffice-i18n-14.0.0.spec b/redhat/applications/koffice-i18n/koffice-i18n-14.0.0.spec index 6def257e3..41f73c1b9 100644 --- a/redhat/applications/koffice-i18n/koffice-i18n-14.0.0.spec +++ b/redhat/applications/koffice-i18n/koffice-i18n-14.0.0.spec @@ -43,7 +43,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 1.6.3 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: Internationalization support for Koffice [Trinity] Group: User Interface/Desktops URL: http://www.trinitydesktop.org/ diff --git a/redhat/applications/koffice-i18n/koffice-i18n-3.5.13.2.spec b/redhat/applications/koffice-i18n/koffice-i18n-3.5.13.2.spec index 8d27104f1..f9f37c150 100644 --- a/redhat/applications/koffice-i18n/koffice-i18n-3.5.13.2.spec +++ b/redhat/applications/koffice-i18n/koffice-i18n-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg koffice-i18n %define tde_version 3.5.13.2 -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -32,7 +27,7 @@ Name: trinity-%{tde_pkg} Summary: Internationalization support for Koffice [Trinity] Version: 1.6.3 -Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist} Vendor: Trinity Project Packager: Francois Andriot <francois.andriot@free.fr> diff --git a/redhat/applications/koffice/koffice-14.0.0.spec b/redhat/applications/koffice/koffice-14.0.0.spec index 16e69a105..083b85f4e 100644 --- a/redhat/applications/koffice/koffice-14.0.0.spec +++ b/redhat/applications/koffice/koffice-14.0.0.spec @@ -52,7 +52,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 1.6.3 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: An integrated office suite Group: Applications/Productivity URL: http://www.trinitydesktop.org/ @@ -1129,6 +1129,12 @@ export CXXFLAGS="${CXXFLAGS} -I${RD}/%_normalized_cpu-linux" -e "/TDEApplication/ s|\");|\", true, true, true);|" %endif +# FTBFS on Fedora 22 +%if 0%{?fedora} == 22 +%__sed -i "lib/kross/ruby/rubyinterpreter.cpp" \ + -e "s|rb_set_safe_level|//rb_set_safe_level|" +%endif + %configure \ --prefix=%{tde_prefix} \ --exec-prefix=%{tde_prefix} \ diff --git a/redhat/applications/koffice/koffice-3.5.13.2.spec b/redhat/applications/koffice/koffice-3.5.13.2.spec index 22cfb1166..701c8af8a 100644 --- a/redhat/applications/koffice/koffice-3.5.13.2.spec +++ b/redhat/applications/koffice/koffice-3.5.13.2.spec @@ -5,11 +5,6 @@ # Required for Mageia 2: removes the ldflag '--no-undefined' %define _disable_ld_no_undefined 1 -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -41,7 +36,7 @@ Name: trinity-%{tde_pkg} Summary: An integrated office suite Version: 1.6.3 -Release: %{?!preversion:9}%{?preversion:8_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:9}%{?preversion:8_%{preversion}}%{?dist} Group: Applications/Productivity License: GPLv2+ diff --git a/redhat/applications/konversation/konversation-14.0.0.spec b/redhat/applications/konversation/konversation-14.0.0.spec index d92e56f92..16ab97a04 100644 --- a/redhat/applications/konversation/konversation-14.0.0.spec +++ b/redhat/applications/konversation/konversation-14.0.0.spec @@ -37,7 +37,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 1.1 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: User friendly Internet Relay Chat (IRC) client for TDE Group: Applications/Utilities URL: http://www.trinitydesktop.org/ diff --git a/redhat/applications/konversation/konversation-3.5.13.2.spec b/redhat/applications/konversation/konversation-3.5.13.2.spec index 8043497d9..57109300b 100644 --- a/redhat/applications/konversation/konversation-3.5.13.2.spec +++ b/redhat/applications/konversation/konversation-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg konversation %define tde_version 3.5.13.2 -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-%{tde_pkg} Summary: user friendly Internet Relay Chat (IRC) client for TDE [Trinity] Version: 1.1 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities diff --git a/redhat/applications/kopete-otr/kopete-otr-14.0.0.spec b/redhat/applications/kopete-otr/kopete-otr-14.0.0.spec index 47d4c79cc..ef938812e 100644 --- a/redhat/applications/kopete-otr/kopete-otr-14.0.0.spec +++ b/redhat/applications/kopete-otr/kopete-otr-14.0.0.spec @@ -40,7 +40,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 0.7 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: Off-The-Record encryption for Kopete [Trinity] Group: Applications/Utilities URL: http://www.trinitydesktop.org/ diff --git a/redhat/applications/kopete-otr/kopete-otr-3.5.13.2.spec b/redhat/applications/kopete-otr/kopete-otr-3.5.13.2.spec index 3cdc837e8..41e12128b 100644 --- a/redhat/applications/kopete-otr/kopete-otr-3.5.13.2.spec +++ b/redhat/applications/kopete-otr/kopete-otr-3.5.13.2.spec @@ -9,11 +9,6 @@ # Under Mageia 3, we require "libotr3" package -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -34,7 +29,7 @@ Name: trinity-%{tde_pkg} Summary: Off-The-Record encryption for Kopete [Trinity] Version: 0.7 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities diff --git a/redhat/applications/kpicosim/kpicosim-14.0.0.spec b/redhat/applications/kpicosim/kpicosim-14.0.0.spec index 5fc79faf0..d08e1945f 100644 --- a/redhat/applications/kpicosim/kpicosim-14.0.0.spec +++ b/redhat/applications/kpicosim/kpicosim-14.0.0.spec @@ -37,7 +37,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 0.6a -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: IDE and simulator for the Xilinx PicoBlaze-3 [Trinity] Group: Applications/Utilities URL: http://www.trinitydesktop.org diff --git a/redhat/applications/kpicosim/kpicosim-3.5.13.2.spec b/redhat/applications/kpicosim/kpicosim-3.5.13.2.spec index 2dc0c7831..2d6ad2650 100644 --- a/redhat/applications/kpicosim/kpicosim-3.5.13.2.spec +++ b/redhat/applications/kpicosim/kpicosim-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg kpicosim %define tde_version 3.5.13.2 -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-%{tde_pkg} Summary: IDE and simulator for the Xilinx PicoBlaze-3 [Trinity] Version: 0.6a -Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities diff --git a/redhat/applications/kpilot/kpilot-14.0.0.spec b/redhat/applications/kpilot/kpilot-14.0.0.spec index 1ab6d8790..5dbcadd9a 100644 --- a/redhat/applications/kpilot/kpilot-14.0.0.spec +++ b/redhat/applications/kpilot/kpilot-14.0.0.spec @@ -37,7 +37,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 0.7 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: TDE Palm Pilot hot-sync tool Group: Applications/Utilities URL: http://www.trinitydesktop.org diff --git a/redhat/applications/kpilot/kpilot-3.5.13.2.spec b/redhat/applications/kpilot/kpilot-3.5.13.2.spec index 195957800..882a6cd34 100644 --- a/redhat/applications/kpilot/kpilot-3.5.13.2.spec +++ b/redhat/applications/kpilot/kpilot-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg kpilot %define tde_version 3.5.13.2 -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-%{tde_pkg} Summary: TDE Palm Pilot hot-sync tool Version: 0.7 -Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities diff --git a/redhat/applications/kpowersave/kpowersave-14.0.0.spec b/redhat/applications/kpowersave/kpowersave-14.0.0.spec index a9bde95f2..270eb7dfe 100644 --- a/redhat/applications/kpowersave/kpowersave-14.0.0.spec +++ b/redhat/applications/kpowersave/kpowersave-14.0.0.spec @@ -37,7 +37,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 0.7.3 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: HAL based power management applet for Trinityfiles or directories. Group: Applications/Utilities URL: http://www.trinitydesktop.org/ diff --git a/redhat/applications/kpowersave/kpowersave-3.5.13.2.spec b/redhat/applications/kpowersave/kpowersave-3.5.13.2.spec index 2493a4b50..eb98c09af 100644 --- a/redhat/applications/kpowersave/kpowersave-3.5.13.2.spec +++ b/redhat/applications/kpowersave/kpowersave-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg kpowersave %define tde_version 3.5.13.2 -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -26,7 +21,7 @@ Name: trinity-%{tde_pkg} Version: 0.7.3 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} Summary: HAL based power management applet for Trinityfiles or directories. License: GPLv2+ diff --git a/redhat/applications/krecipes/krecipes-14.0.0.spec b/redhat/applications/krecipes/krecipes-14.0.0.spec index 6fe829181..d44cf9cc1 100644 --- a/redhat/applications/krecipes/krecipes-14.0.0.spec +++ b/redhat/applications/krecipes/krecipes-14.0.0.spec @@ -37,7 +37,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 1.0beta2 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: Recipes manager for TDE Group: Applications/Utilities URL: http://www.trinitydesktop.org/ diff --git a/redhat/applications/krename/krename-14.0.0.spec b/redhat/applications/krename/krename-14.0.0.spec index 922377b4a..6ee73f52a 100644 --- a/redhat/applications/krename/krename-14.0.0.spec +++ b/redhat/applications/krename/krename-14.0.0.spec @@ -37,7 +37,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 3.0.14 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: A TDE batch file renaming utility Group: Applications/Utilities URL: http://www.trinitydesktop.org/ diff --git a/redhat/applications/krename/krename-3.5.13.2.spec b/redhat/applications/krename/krename-3.5.13.2.spec index c3e967f63..63ecbf95a 100644 --- a/redhat/applications/krename/krename-3.5.13.2.spec +++ b/redhat/applications/krename/krename-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg krename %define tde_version 3.5.13.2 -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-%{tde_pkg} Summary: A TDE batch file renaming utility. Version: 3.0.14 -Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities diff --git a/redhat/applications/krusader/krusader-14.0.0.spec b/redhat/applications/krusader/krusader-14.0.0.spec index 3c5d95197..40141ebef 100644 --- a/redhat/applications/krusader/krusader-14.0.0.spec +++ b/redhat/applications/krusader/krusader-14.0.0.spec @@ -37,7 +37,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 1.90.0 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: Twin-panel (commander-style) file manager for TDE (and other desktops) Group: Applications/Utilities URL: http://www.trinitydesktop.org/ diff --git a/redhat/applications/krusader/krusader-3.5.13.2.spec b/redhat/applications/krusader/krusader-3.5.13.2.spec index 22728025c..f22673e5a 100644 --- a/redhat/applications/krusader/krusader-3.5.13.2.spec +++ b/redhat/applications/krusader/krusader-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg krusader %define tde_version 3.5.13.2 -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-%{tde_pkg} Summary: twin-panel (commander-style) file manager for TDE (and other desktops) Version: 1.90.0 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities diff --git a/redhat/applications/kscope/kscope-14.0.0.spec b/redhat/applications/kscope/kscope-14.0.0.spec index dbf097247..ea42baaff 100644 --- a/redhat/applications/kscope/kscope-14.0.0.spec +++ b/redhat/applications/kscope/kscope-14.0.0.spec @@ -37,7 +37,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 1.6.2 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: Source editing environment for TDE Group: Applications/Internet URL: http://kscope.sourceforge.net diff --git a/redhat/applications/ksensors/ksensors-14.0.0.spec b/redhat/applications/ksensors/ksensors-14.0.0.spec index c2b3c6a9c..b3cb58bc5 100644 --- a/redhat/applications/ksensors/ksensors-14.0.0.spec +++ b/redhat/applications/ksensors/ksensors-14.0.0.spec @@ -37,7 +37,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 0.7.3 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: Trinity Frontend to lm_sensors Group: Applications/System URL: http://ksensors.sourceforge.net/ diff --git a/redhat/applications/ksensors/ksensors-3.5.13.2.spec b/redhat/applications/ksensors/ksensors-3.5.13.2.spec index 2b14d2946..648a04fa6 100644 --- a/redhat/applications/ksensors/ksensors-3.5.13.2.spec +++ b/redhat/applications/ksensors/ksensors-3.5.13.2.spec @@ -1,8 +1,3 @@ -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # Default version for this component %define tde_pkg ksensors %define tde_version 3.5.13.2 @@ -24,7 +19,7 @@ Name: trinity-ksensors Version: 0.7.3 -Release: %{?!preversion:20}%{?preversion:19_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:20}%{?preversion:19_%{preversion}}%{?dist} Summary: Trinity Frontend to lm_sensors Group: Applications/System diff --git a/redhat/applications/kshowmail/kshowmail-14.0.0.spec b/redhat/applications/kshowmail/kshowmail-14.0.0.spec index 41c97984d..522c4b338 100644 --- a/redhat/applications/kshowmail/kshowmail-14.0.0.spec +++ b/redhat/applications/kshowmail/kshowmail-14.0.0.spec @@ -37,7 +37,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 3.3.1 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: Look messages into your mail server Group: Applications/Internet URL: http://sourceforge.net/projects/kshowmail/ diff --git a/redhat/applications/kshutdown/kshutdown-14.0.0.spec b/redhat/applications/kshutdown/kshutdown-14.0.0.spec index b35d8b6f7..98b2c16c4 100644 --- a/redhat/applications/kshutdown/kshutdown-14.0.0.spec +++ b/redhat/applications/kshutdown/kshutdown-14.0.0.spec @@ -37,7 +37,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 1.0.4 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: An advanced shut down utility for TDE Group: Applications/Multimedia URL: http://kde-apps.org/content/show.php?content=41180 diff --git a/redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin-14.0.0.spec b/redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin-14.0.0.spec index 22a1d6fe8..80546f7b3 100644 --- a/redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin-14.0.0.spec +++ b/redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin-14.0.0.spec @@ -37,7 +37,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 0.4.2 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: Fading splash screen engine for Trinity Group: Applications/Utilities URL: http://www.trinitydesktop.org/ diff --git a/redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin-3.5.13.2.spec b/redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin-3.5.13.2.spec index 207ac815b..b3771f366 100644 --- a/redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin-3.5.13.2.spec +++ b/redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg ksplash-engine-moodin %define tde_version 3.5.13.2 -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-%{tde_pkg} Summary: fading splash screen engine for Trinity Version: 0.4.2 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities diff --git a/redhat/applications/ksquirrel/ksquirrel-14.0.0.spec b/redhat/applications/ksquirrel/ksquirrel-14.0.0.spec index fc3a033be..e20c96e20 100644 --- a/redhat/applications/ksquirrel/ksquirrel-14.0.0.spec +++ b/redhat/applications/ksquirrel/ksquirrel-14.0.0.spec @@ -38,7 +38,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 0.8.0 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: Powerful Trinity image viewer Group: Amusements/Games URL: http://www.trinitydesktop.org/ diff --git a/redhat/applications/ksquirrel/ksquirrel-3.5.13.2.spec b/redhat/applications/ksquirrel/ksquirrel-3.5.13.2.spec index 733644295..82fa65c1a 100644 --- a/redhat/applications/ksquirrel/ksquirrel-3.5.13.2.spec +++ b/redhat/applications/ksquirrel/ksquirrel-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg ksquirrel %define tde_version 3.5.13.2 -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-%{tde_pkg} Summary: Powerful Trinity image viewer Version: 0.8.0 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} License: GPLv2+ Group: Amusements/Games diff --git a/redhat/applications/kstreamripper/kstreamripper-14.0.0.spec b/redhat/applications/kstreamripper/kstreamripper-14.0.0.spec index 8d5033d26..581e05012 100644 --- a/redhat/applications/kstreamripper/kstreamripper-14.0.0.spec +++ b/redhat/applications/kstreamripper/kstreamripper-14.0.0.spec @@ -37,7 +37,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 0.3.4 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: TDE frontend for streamripper Group: Applications/Utilities URL: http://www.trinitydesktop.org/ diff --git a/redhat/applications/kstreamripper/kstreamripper-3.5.13.2.spec b/redhat/applications/kstreamripper/kstreamripper-3.5.13.2.spec index 03a9332dc..4bec61bdc 100644 --- a/redhat/applications/kstreamripper/kstreamripper-3.5.13.2.spec +++ b/redhat/applications/kstreamripper/kstreamripper-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg kstreamripper %define tde_version 3.5.13.2 -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -28,7 +23,7 @@ Name: trinity-%{tde_pkg} Summary: TDE frontend for streamripper Version: 0.3.4 -Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities diff --git a/redhat/applications/ksystemlog/ksystemlog-14.0.0.spec b/redhat/applications/ksystemlog/ksystemlog-14.0.0.spec index d86d19ffc..354b004f3 100644 --- a/redhat/applications/ksystemlog/ksystemlog-14.0.0.spec +++ b/redhat/applications/ksystemlog/ksystemlog-14.0.0.spec @@ -37,7 +37,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 0.3.2 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: System log viewer tool for Trinity Group: Applications/System URL: http://ksystemlog.forum-software.org diff --git a/redhat/applications/ksystemlog/ksystemlog-3.5.13.2.spec b/redhat/applications/ksystemlog/ksystemlog-3.5.13.2.spec index bbf8a68bc..0c3ad4fd9 100644 --- a/redhat/applications/ksystemlog/ksystemlog-3.5.13.2.spec +++ b/redhat/applications/ksystemlog/ksystemlog-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg ksystemlog %define tde_version 3.5.13.2 -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-%{tde_pkg} Summary: system log viewer tool for Trinity Version: 0.3.2 -Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/System diff --git a/redhat/applications/ktechlab/ktechlab-14.0.0.spec b/redhat/applications/ktechlab/ktechlab-14.0.0.spec index 463145cd0..0ba006baa 100644 --- a/redhat/applications/ktechlab/ktechlab-14.0.0.spec +++ b/redhat/applications/ktechlab/ktechlab-14.0.0.spec @@ -37,7 +37,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 0.3 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: Circuit simulator for microcontrollers and electronics [Trinity] Group: Applications/Utilities URL: http://www.trinitydesktop.org/ diff --git a/redhat/applications/ktechlab/ktechlab-3.5.13.2.spec b/redhat/applications/ktechlab/ktechlab-3.5.13.2.spec index 95b225c77..4bed130f6 100644 --- a/redhat/applications/ktechlab/ktechlab-3.5.13.2.spec +++ b/redhat/applications/ktechlab/ktechlab-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg ktechlab %define tde_version 3.5.13.2 -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-%{tde_pkg} Summary: circuit simulator for microcontrollers and electronics [Trinity] Version: 0.3 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities diff --git a/redhat/applications/ktorrent/ktorrent-14.0.0.spec b/redhat/applications/ktorrent/ktorrent-14.0.0.spec index c7adf8c90..7ec61f609 100644 --- a/redhat/applications/ktorrent/ktorrent-14.0.0.spec +++ b/redhat/applications/ktorrent/ktorrent-14.0.0.spec @@ -37,7 +37,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 2.2.8 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: BitTorrent client for Trinity Group: Applications/Utilities URL: http://ktorrent.org diff --git a/redhat/applications/ktorrent/ktorrent-3.5.13.2.spec b/redhat/applications/ktorrent/ktorrent-3.5.13.2.spec index 5324722a6..edd1d8ee6 100644 --- a/redhat/applications/ktorrent/ktorrent-3.5.13.2.spec +++ b/redhat/applications/ktorrent/ktorrent-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg ktorrent %define tde_version 3.5.13.2 -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-%{tde_pkg} Summary: BitTorrent client for Trinity Version: 2.2.8 -Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities diff --git a/redhat/applications/kuickshow/kuickshow-14.0.0.spec b/redhat/applications/kuickshow/kuickshow-14.0.0.spec index 8f14bd3f5..b5f8d694f 100644 --- a/redhat/applications/kuickshow/kuickshow-14.0.0.spec +++ b/redhat/applications/kuickshow/kuickshow-14.0.0.spec @@ -37,7 +37,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 0.8.13 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: Quick picture viewer for TDE Group: Applications/Utilities URL: http://www.trinitydesktop.org/ diff --git a/redhat/applications/kuickshow/kuickshow-3.5.13.2.spec b/redhat/applications/kuickshow/kuickshow-3.5.13.2.spec index b34d3ca68..c70cf47aa 100644 --- a/redhat/applications/kuickshow/kuickshow-3.5.13.2.spec +++ b/redhat/applications/kuickshow/kuickshow-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg kuickshow %define tde_version 3.5.13.2 -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-%{tde_pkg} Summary: Quick picture viewer for TDE Version: 0.8.13 -Release: %{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities diff --git a/redhat/applications/kvirc/kvirc-14.0.0.spec b/redhat/applications/kvirc/kvirc-14.0.0.spec index 25dbdfe86..b5fc8739a 100644 --- a/redhat/applications/kvirc/kvirc-14.0.0.spec +++ b/redhat/applications/kvirc/kvirc-14.0.0.spec @@ -37,7 +37,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 3.4.0 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: Trinity based next generation IRC client with module support Group: Applications/Utilities URL: http://kvirc.net/ diff --git a/redhat/applications/kvirc/kvirc-3.5.13.2.spec b/redhat/applications/kvirc/kvirc-3.5.13.2.spec index 36374f071..37641ea2b 100644 --- a/redhat/applications/kvirc/kvirc-3.5.13.2.spec +++ b/redhat/applications/kvirc/kvirc-3.5.13.2.spec @@ -4,11 +4,6 @@ %define tde_pkg kvirc %define tde_version 3.5.13.2 -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -29,7 +24,7 @@ Name: trinity-%{tde_pkg} Summary: Trinity based next generation IRC client with module support Version: 3.4.0 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities diff --git a/redhat/applications/kvkbd/kvkbd-14.0.0.spec b/redhat/applications/kvkbd/kvkbd-14.0.0.spec index 5e42de260..d426bf013 100644 --- a/redhat/applications/kvkbd/kvkbd-14.0.0.spec +++ b/redhat/applications/kvkbd/kvkbd-14.0.0.spec @@ -37,7 +37,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 0.4.8 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} Summary: Virtual keyboard for TDE Group: Applications/System URL: http://pan4os.info/main/index.php diff --git a/redhat/applications/kvkbd/kvkbd-3.5.13.2.spec b/redhat/applications/kvkbd/kvkbd-3.5.13.2.spec index 763f674f2..7ebca6bcc 100644 --- a/redhat/applications/kvkbd/kvkbd-3.5.13.2.spec +++ b/redhat/applications/kvkbd/kvkbd-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg kvkbd %define tde_version 3.5.13.2 -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-%{tde_pkg} Summary: Virtual keyboard for TDE [Trinity] Version: 0.4.8 -Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/System diff --git a/redhat/applications/kvpnc/kvpnc-14.0.0.spec b/redhat/applications/kvpnc/kvpnc-14.0.0.spec index e3340ca78..4cddf505b 100644 --- a/redhat/applications/kvpnc/kvpnc-14.0.0.spec +++ b/redhat/applications/kvpnc/kvpnc-14.0.0.spec @@ -37,7 +37,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 0.9.6a -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: Vpn clients frontend for TDE Group: Applications/Utilities URL: http://www.trinitydesktop.org/ diff --git a/redhat/applications/mplayerthumbs/mplayerthumbs-14.0.0.spec b/redhat/applications/mplayerthumbs/mplayerthumbs-14.0.0.spec index 45af4a3d2..897874c1a 100644 --- a/redhat/applications/mplayerthumbs/mplayerthumbs-14.0.0.spec +++ b/redhat/applications/mplayerthumbs/mplayerthumbs-14.0.0.spec @@ -37,7 +37,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 0.5b -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: A video thumbnail generator for TDE file managers Group: Applications/Multimedia URL: http://kde-apps.org/content/show.php?content=41180 diff --git a/redhat/applications/piklab/piklab-14.0.0.spec b/redhat/applications/piklab/piklab-14.0.0.spec index cced2e4ad..5ffce9ebd 100644 --- a/redhat/applications/piklab/piklab-14.0.0.spec +++ b/redhat/applications/piklab/piklab-14.0.0.spec @@ -37,7 +37,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 0.15.2 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: IDE for PIC-microcontroller development [Trinity] Group: Applications/Utilities URL: http://www.trinitydesktop.org/ diff --git a/redhat/applications/piklab/piklab-3.5.13.2.spec b/redhat/applications/piklab/piklab-3.5.13.2.spec index a44e1fd82..e118dde93 100644 --- a/redhat/applications/piklab/piklab-3.5.13.2.spec +++ b/redhat/applications/piklab/piklab-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg piklab %define tde_version 3.5.13.2 -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-%{tde_pkg} Summary: IDE for PIC-microcontroller development [Trinity] Version: 0.15.2 -Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities diff --git a/redhat/applications/potracegui/potracegui-14.0.0.spec b/redhat/applications/potracegui/potracegui-14.0.0.spec index b7e115923..490acee1d 100644 --- a/redhat/applications/potracegui/potracegui-14.0.0.spec +++ b/redhat/applications/potracegui/potracegui-14.0.0.spec @@ -37,7 +37,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 1.3 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: TDE frontend for potrace [Trinity] Group: Applications/Multimedia URL: http://potracegui.sourceforge.net diff --git a/redhat/applications/potracegui/potracegui-3.5.13.2.spec b/redhat/applications/potracegui/potracegui-3.5.13.2.spec index 25db4b67d..db9a232e9 100644 --- a/redhat/applications/potracegui/potracegui-3.5.13.2.spec +++ b/redhat/applications/potracegui/potracegui-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg potracegui %define tde_version 3.5.13.2 -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-%{tde_pkg} Summary: TDE frontend for potrace [Trinity] Version: 1.3 -Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Multimedia diff --git a/redhat/applications/qt4-tqt-theme-engine/qt4-tqt-theme-engine-14.0.0.spec b/redhat/applications/qt4-tqt-theme-engine/qt4-tqt-theme-engine-14.0.0.spec index f5647b8e1..76f409473 100644 --- a/redhat/applications/qt4-tqt-theme-engine/qt4-tqt-theme-engine-14.0.0.spec +++ b/redhat/applications/qt4-tqt-theme-engine/qt4-tqt-theme-engine-14.0.0.spec @@ -40,7 +40,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 0.1 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: TDE theme engine for Qt4 Group: Applications/Utilities URL: http://www.trinitydesktop.org/ diff --git a/redhat/applications/rosegarden/rosegarden-14.0.0.spec b/redhat/applications/rosegarden/rosegarden-14.0.0.spec index af44cfe0c..54c137409 100644 --- a/redhat/applications/rosegarden/rosegarden-14.0.0.spec +++ b/redhat/applications/rosegarden/rosegarden-14.0.0.spec @@ -40,7 +40,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 1.7.0 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: Music editor and MIDI/audio sequencer [Trinity] Group: Applications/Multimedia URL: http://www.rosegardenmusic.com/ diff --git a/redhat/applications/rosegarden/rosegarden-3.5.13.2.spec b/redhat/applications/rosegarden/rosegarden-3.5.13.2.spec index 4dc15831a..6d7a86ff4 100644 --- a/redhat/applications/rosegarden/rosegarden-3.5.13.2.spec +++ b/redhat/applications/rosegarden/rosegarden-3.5.13.2.spec @@ -5,11 +5,6 @@ # Required for Mageia 2: removes the ldflag '--no-undefined' %define _disable_ld_no_undefined 1 -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -30,7 +25,7 @@ Name: trinity-%{tde_pkg} Summary: music editor and MIDI/audio sequencer [Trinity] Version: 1.7.0 -Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Multimedia diff --git a/redhat/applications/smartcardauth/smartcardauth-14.0.0.spec b/redhat/applications/smartcardauth/smartcardauth-14.0.0.spec index 0be439fd8..99bc7d0c8 100644 --- a/redhat/applications/smartcardauth/smartcardauth-14.0.0.spec +++ b/redhat/applications/smartcardauth/smartcardauth-14.0.0.spec @@ -37,7 +37,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 1.0 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: SmartCard Login and LUKS Decrypt, Setup Utility Group: Applications/System URL: http://www.trinitydesktop.org/ @@ -56,7 +56,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz Source1: trinity-%{tde_pkg}-rpmlintrc -Patch0: %{tde_pkg}-14.0.0.patch +#Patch0: %{tde_pkg}-14.0.0.patch BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} @@ -139,7 +139,7 @@ in addition to the PKCS certificate functionality %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%patch0 -p1 +#patch0 -p1 %__sed -i "Makefile" \ -e "s|/usr/lib/perl5/Chipcard|%{_libdir}/perl5/vendor_perl/Chipcard|g" diff --git a/redhat/applications/smartcardauth/smartcardauth-3.5.13.2.spec b/redhat/applications/smartcardauth/smartcardauth-3.5.13.2.spec index e7c9a8b1d..026a14143 100644 --- a/redhat/applications/smartcardauth/smartcardauth-3.5.13.2.spec +++ b/redhat/applications/smartcardauth/smartcardauth-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg smartcardauth %define tde_version 3.5.13.2 -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-%{tde_pkg} Summary: SmartCard Login and LUKS Decrypt, Setup Utility Version: 1.0 -Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/System diff --git a/redhat/applications/smb4k/smb4k-14.0.0.spec b/redhat/applications/smb4k/smb4k-14.0.0.spec index 1e0c28158..f5892742b 100644 --- a/redhat/applications/smb4k/smb4k-14.0.0.spec +++ b/redhat/applications/smb4k/smb4k-14.0.0.spec @@ -37,7 +37,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 0.9.4 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: A Samba (SMB) share advanced browser for Trinity Group: Applications/Utilities URL: http://www.trinitydesktop.org diff --git a/redhat/applications/smb4k/smb4k-3.5.13.2.spec b/redhat/applications/smb4k/smb4k-3.5.13.2.spec index 353bd9ae8..fc1501e54 100644 --- a/redhat/applications/smb4k/smb4k-3.5.13.2.spec +++ b/redhat/applications/smb4k/smb4k-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg smb4k %define tde_version 3.5.13.2 -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-%{tde_pkg} Summary: A Samba (SMB) share advanced browser for Trinity Version: 0.9.4 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities diff --git a/redhat/applications/soundkonverter/soundkonverter-14.0.0.spec b/redhat/applications/soundkonverter/soundkonverter-14.0.0.spec index 8f96695e8..aaccd6c20 100644 --- a/redhat/applications/soundkonverter/soundkonverter-14.0.0.spec +++ b/redhat/applications/soundkonverter/soundkonverter-14.0.0.spec @@ -37,7 +37,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 0.3.8 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: Audio converter frontend for Trinity Group: Application/Multimedia URL: http://potracegui.sourceforge.net @@ -108,14 +108,14 @@ See README.Debian for more informations on supported formats. %package amarok Summary: audio converter frontend for Trinity (Amarok script) Group: Application/Multimedia -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} Requires: trinity-amarok %description amarok Amarok script for soundKonverter. It allows you to easily transcode files when transferring them to your media device. -See the 'soundkonverter-trinity' package for more information. +See the 'trinity-soundkonverter' package for more information. ########## diff --git a/redhat/applications/soundkonverter/soundkonverter-3.5.13.2.spec b/redhat/applications/soundkonverter/soundkonverter-3.5.13.2.spec index ef5605ff3..91755098a 100644 --- a/redhat/applications/soundkonverter/soundkonverter-3.5.13.2.spec +++ b/redhat/applications/soundkonverter/soundkonverter-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg soundkonverter %define tde_version 3.5.13.2 -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE 3.5.13 specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-%{tde_pkg} Summary: audio converter frontend for Trinity Version: 0.3.8 -Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist} License: GPLv2+ Group: Application/Multimedia diff --git a/redhat/applications/tde-guidance/tde-guidance-14.0.0.spec b/redhat/applications/tde-guidance/tde-guidance-14.0.0.spec index cde6fa645..4fb6d7092 100644 --- a/redhat/applications/tde-guidance/tde-guidance-14.0.0.spec +++ b/redhat/applications/tde-guidance/tde-guidance-14.0.0.spec @@ -40,7 +40,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 0.8.0svn20080103 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: A collection of system administration tools for Trinity Group: Applications/Utilities URL: http://www.simonzone.com/software/guidance diff --git a/redhat/applications/tde-guidance/tde-guidance-3.5.13.2.spec b/redhat/applications/tde-guidance/tde-guidance-3.5.13.2.spec index dc77f43b5..ce0aec884 100644 --- a/redhat/applications/tde-guidance/tde-guidance-3.5.13.2.spec +++ b/redhat/applications/tde-guidance/tde-guidance-3.5.13.2.spec @@ -6,11 +6,6 @@ %{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -32,7 +27,7 @@ Name: trinity-%{tde_pkg} Summary: A collection of system administration tools for Trinity Version: 0.8.0svn20080103 -Release: %{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities diff --git a/redhat/applications/tde-style-lipstik/tde-style-lipstik-14.0.0.spec b/redhat/applications/tde-style-lipstik/tde-style-lipstik-14.0.0.spec index 2e834c7b5..8d2cc6790 100644 --- a/redhat/applications/tde-style-lipstik/tde-style-lipstik-14.0.0.spec +++ b/redhat/applications/tde-style-lipstik/tde-style-lipstik-14.0.0.spec @@ -37,7 +37,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 2.2.3 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: Lipstik style for TDE Group: Applications/Utilities URL: http://www.trinitydesktop.org/ diff --git a/redhat/applications/tde-style-lipstik/tde-style-lipstik-3.5.13.2.spec b/redhat/applications/tde-style-lipstik/tde-style-lipstik-3.5.13.2.spec index 3661eebfb..6e4a185ea 100644 --- a/redhat/applications/tde-style-lipstik/tde-style-lipstik-3.5.13.2.spec +++ b/redhat/applications/tde-style-lipstik/tde-style-lipstik-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg tde-style-lipstik %define tde_version 3.5.13.2 -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-tde-style-lipstik Summary: Lipstik style for TDE Version: 2.2.3 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities diff --git a/redhat/applications/tde-style-qtcurve/tde-style-qtcurve-14.0.0.spec b/redhat/applications/tde-style-qtcurve/tde-style-qtcurve-14.0.0.spec index e812c2f1c..48f5051ed 100644 --- a/redhat/applications/tde-style-qtcurve/tde-style-qtcurve-14.0.0.spec +++ b/redhat/applications/tde-style-qtcurve/tde-style-qtcurve-14.0.0.spec @@ -37,7 +37,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 0.55.2 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: This is a set of widget styles for Trinity based apps Group: Applications/Utilities URL: http://www.trinitydesktop.org/ diff --git a/redhat/applications/tde-style-qtcurve/tde-style-qtcurve-3.5.13.2.spec b/redhat/applications/tde-style-qtcurve/tde-style-qtcurve-3.5.13.2.spec index 79a1fa67d..c6bd0b9e3 100644 --- a/redhat/applications/tde-style-qtcurve/tde-style-qtcurve-3.5.13.2.spec +++ b/redhat/applications/tde-style-qtcurve/tde-style-qtcurve-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg tde-style-qtcurve %define tde_version 3.5.13.2 -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-tde-style-qtcurve Summary: This is a set of widget styles for Trinity based apps Version: 0.55.2 -Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities diff --git a/redhat/applications/tde-systemsettings/tde-systemsettings-14.0.0.spec b/redhat/applications/tde-systemsettings/tde-systemsettings-14.0.0.spec index 11b860c1b..1494789dc 100644 --- a/redhat/applications/tde-systemsettings/tde-systemsettings-14.0.0.spec +++ b/redhat/applications/tde-systemsettings/tde-systemsettings-14.0.0.spec @@ -39,7 +39,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 0.0svn20070312 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: Easy to use control centre for TDE Group: Applications/Utilities URL: http://www.trinitydesktop.org diff --git a/redhat/applications/tde-systemsettings/tde-systemsettings-3.5.13.2.spec b/redhat/applications/tde-systemsettings/tde-systemsettings-3.5.13.2.spec index cf9b3a815..869bed64a 100644 --- a/redhat/applications/tde-systemsettings/tde-systemsettings-3.5.13.2.spec +++ b/redhat/applications/tde-systemsettings/tde-systemsettings-3.5.13.2.spec @@ -4,7 +4,6 @@ # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?tde_prefix}" != "/usr" -%define _variant .opt # Currently, menu files under /etc/xdg conflict with KDE4 %define tde_sysconfdir %{tde_prefix}/etc %endif @@ -29,7 +28,7 @@ Name: trinity-tde-systemsettings Summary: easy to use control centre for TDE Version: 0.0svn20070312 -Release: %{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities diff --git a/redhat/applications/tdeio-apt/tdeio-apt-14.0.0.spec b/redhat/applications/tdeio-apt/tdeio-apt-14.0.0.spec index 3508548fa..69c3b9ee9 100644 --- a/redhat/applications/tdeio-apt/tdeio-apt-14.0.0.spec +++ b/redhat/applications/tdeio-apt/tdeio-apt-14.0.0.spec @@ -37,7 +37,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 0.13.2 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: An apt-cache ioslave for Trinity Group: Applications/Utilities URL: http://lpnotfr.free.fr/ diff --git a/redhat/applications/tdeio-apt/tdeio-apt-3.5.13.2.spec b/redhat/applications/tdeio-apt/tdeio-apt-3.5.13.2.spec index 316566375..90e06faa9 100644 --- a/redhat/applications/tdeio-apt/tdeio-apt-3.5.13.2.spec +++ b/redhat/applications/tdeio-apt/tdeio-apt-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg tdeio-apt %define tde_version 3.5.13.2 -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-%{tde_pkg} Summary: An apt-cache ioslave for Trinity Version: 0.13.2 -Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities diff --git a/redhat/applications/tdeio-ftps/tdeio-ftps-14.0.0.spec b/redhat/applications/tdeio-ftps/tdeio-ftps-14.0.0.spec index 902f012bb..8d6311be2 100644 --- a/redhat/applications/tdeio-ftps/tdeio-ftps-14.0.0.spec +++ b/redhat/applications/tdeio-ftps/tdeio-ftps-14.0.0.spec @@ -37,7 +37,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 0.1 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: An ftps TDEIO slave for Trinity Group: Productivity/Networking/Ftp/Clients URL: http://www.trinitydesktop.org/ diff --git a/redhat/applications/tdeio-locate/tdeio-locate-14.0.0.spec b/redhat/applications/tdeio-locate/tdeio-locate-14.0.0.spec index de9f0e744..f8733bf78 100644 --- a/redhat/applications/tdeio-locate/tdeio-locate-14.0.0.spec +++ b/redhat/applications/tdeio-locate/tdeio-locate-14.0.0.spec @@ -37,7 +37,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 0.4.5 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: Tdeio-slave for the locate command [Trinity] Group: Applications/Utilities URL: http://www.trinitydesktop.org diff --git a/redhat/applications/tdeio-locate/tdeio-locate-3.5.13.2.spec b/redhat/applications/tdeio-locate/tdeio-locate-3.5.13.2.spec index 4d8c47caa..7d48dead4 100644 --- a/redhat/applications/tdeio-locate/tdeio-locate-3.5.13.2.spec +++ b/redhat/applications/tdeio-locate/tdeio-locate-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg tdeio-locate %define tde_version 3.5.13.2 -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-%{tde_pkg} Summary: kio-slave for the locate command [Trinity] Version: 0.4.5 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities diff --git a/redhat/applications/tdeio-sword/tdeio-sword-14.0.0.spec b/redhat/applications/tdeio-sword/tdeio-sword-14.0.0.spec index 5699cdfd1..40f6bec37 100644 --- a/redhat/applications/tdeio-sword/tdeio-sword-14.0.0.spec +++ b/redhat/applications/tdeio-sword/tdeio-sword-14.0.0.spec @@ -37,7 +37,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 0.3 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: Tdeio-slave for the Sword Bible tool Group: Productivity/Networking/Ftp/Clients URL: http://lukeplant.me.uk/kio-sword/ diff --git a/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper-14.0.0.spec b/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper-14.0.0.spec index 4523faed9..8b29a2eca 100644 --- a/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper-14.0.0.spec +++ b/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper-14.0.0.spec @@ -37,7 +37,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 0.2 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: Progress dialog for safely removing devices in Trinity Group: Applications/Utilities URL: http://frode.kde.no/misc/tdeio_umountwrapper/ diff --git a/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper-3.5.13.2.spec b/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper-3.5.13.2.spec index f83a7fffa..dbbe3f10f 100644 --- a/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper-3.5.13.2.spec +++ b/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg tdeio-umountwrapper %define tde_version 3.5.13.2 -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-%{tde_pkg} Summary: progress dialog for safely removing devices in Trinity. Version: 0.2 -Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities diff --git a/redhat/applications/tdenetworkmanager/tdenetworkmanager-14.0.0.spec b/redhat/applications/tdenetworkmanager/tdenetworkmanager-14.0.0.spec index 8098b1e2e..937a9d416 100644 --- a/redhat/applications/tdenetworkmanager/tdenetworkmanager-14.0.0.spec +++ b/redhat/applications/tdenetworkmanager/tdenetworkmanager-14.0.0.spec @@ -37,7 +37,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 0.9 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: Trinity applet for Network Manager Group: Applications/Internet URL: http://www.trinitydesktop.org/ diff --git a/redhat/applications/tdepowersave/tdepowersave-14.0.0.spec b/redhat/applications/tdepowersave/tdepowersave-14.0.0.spec index f2c36f22f..53cb423e7 100644 --- a/redhat/applications/tdepowersave/tdepowersave-14.0.0.spec +++ b/redhat/applications/tdepowersave/tdepowersave-14.0.0.spec @@ -38,7 +38,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 0.7.3 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: Power management applet for Trinity Group: Applications/Utilities URL: http://www.trinitydesktop.org/ diff --git a/redhat/applications/tderadio/tderadio-14.0.0.spec b/redhat/applications/tderadio/tderadio-14.0.0.spec index 8d2112031..0fd6038a6 100644 --- a/redhat/applications/tderadio/tderadio-14.0.0.spec +++ b/redhat/applications/tderadio/tderadio-14.0.0.spec @@ -41,7 +41,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 0.1.1.1 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: Comfortable Radio Application for TDE Group: Applications/Utilities URL: http://www.trinitydesktop.org/ diff --git a/redhat/applications/tderadio/tderadio-3.5.13.2.spec b/redhat/applications/tderadio/tderadio-3.5.13.2.spec index 0e30e1b7a..e9a2a6c8a 100644 --- a/redhat/applications/tderadio/tderadio-3.5.13.2.spec +++ b/redhat/applications/tderadio/tderadio-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg tderadio %define tde_version 3.5.13.2 -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -30,7 +25,7 @@ Name: trinity-%{tde_pkg} Summary: Comfortable Radio Application for TDE [Trinity] Version: 0.1.1.1 -Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities diff --git a/redhat/applications/tdesudo/tdesudo-14.0.0.spec b/redhat/applications/tdesudo/tdesudo-14.0.0.spec index 72829ad64..48c9bd5dc 100644 --- a/redhat/applications/tdesudo/tdesudo-14.0.0.spec +++ b/redhat/applications/tdesudo/tdesudo-14.0.0.spec @@ -37,7 +37,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 2.5.1 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: Sudo frontend for Trinity Group: Applications/Utilities URL: http://www.trinitydesktop.org/ diff --git a/redhat/applications/tdesudo/tdesudo-3.5.13.2.spec b/redhat/applications/tdesudo/tdesudo-3.5.13.2.spec index fdea492db..0f132db21 100644 --- a/redhat/applications/tdesudo/tdesudo-3.5.13.2.spec +++ b/redhat/applications/tdesudo/tdesudo-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg tdesudo %define tde_version 3.5.13.2 -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -28,7 +23,7 @@ Name: trinity-%{tde_pkg} Summary: sudo frontend for Trinity Version: 2.5.1 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities diff --git a/redhat/applications/tdesvn/tdesvn-14.0.0.spec b/redhat/applications/tdesvn/tdesvn-14.0.0.spec index 981d534b2..fe87de4ee 100644 --- a/redhat/applications/tdesvn/tdesvn-14.0.0.spec +++ b/redhat/applications/tdesvn/tdesvn-14.0.0.spec @@ -37,7 +37,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 1.0.4 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: Subversion client with tight TDE integration Group: Applications/Utilities URL: http://www.elliptique.net/~ken/kima/ diff --git a/redhat/applications/tdesvn/tdesvn-3.5.13.2.spec b/redhat/applications/tdesvn/tdesvn-3.5.13.2.spec index 6f6a3625c..c93403792 100644 --- a/redhat/applications/tdesvn/tdesvn-3.5.13.2.spec +++ b/redhat/applications/tdesvn/tdesvn-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg tdesvn %define tde_version 3.5.13.2 -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-%{tde_pkg} Summary: subversion client with tight TDE integration [Trinity] Version: 1.0.4 -Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities diff --git a/redhat/applications/tdmtheme/tdmtheme-14.0.0.spec b/redhat/applications/tdmtheme/tdmtheme-14.0.0.spec index dd43dd4b2..aaec96430 100644 --- a/redhat/applications/tdmtheme/tdmtheme-14.0.0.spec +++ b/redhat/applications/tdmtheme/tdmtheme-14.0.0.spec @@ -37,7 +37,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 1.2.2 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: Theme manager for TDM Group: Applications/Utilities URL: http://beta.smileaf.org/projects diff --git a/redhat/applications/tdmtheme/tdmtheme-3.5.13.2.spec b/redhat/applications/tdmtheme/tdmtheme-3.5.13.2.spec index 23c609037..192a7e504 100644 --- a/redhat/applications/tdmtheme/tdmtheme-3.5.13.2.spec +++ b/redhat/applications/tdmtheme/tdmtheme-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg tdmtheme %define tde_version 3.5.13.2 -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-%{tde_pkg} Summary: theme manager for TDM [Trinity] Version: 1.2.2 -Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities diff --git a/redhat/applications/tellico/tellico-14.0.0.spec b/redhat/applications/tellico/tellico-14.0.0.spec index 809254bf8..847b781e4 100644 --- a/redhat/applications/tellico/tellico-14.0.0.spec +++ b/redhat/applications/tellico/tellico-14.0.0.spec @@ -38,7 +38,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 1.3.2.1 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: Icollection manager for books, videos, music [Trinity] Group: Applications/Utilities URL: http://periapsis.org/tellico/ diff --git a/redhat/applications/tellico/tellico-3.5.13.2.spec b/redhat/applications/tellico/tellico-3.5.13.2.spec index 20549a7e5..60926fdf3 100644 --- a/redhat/applications/tellico/tellico-3.5.13.2.spec +++ b/redhat/applications/tellico/tellico-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg tellico %define tde_version 3.5.13.2 -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-%{tde_pkg} Summary: Icollection manager for books, videos, music [Trinity] Version: 1.3.2.1 -Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities diff --git a/redhat/applications/tork/tork-14.0.0.spec b/redhat/applications/tork/tork-14.0.0.spec index 8ed36935a..93507aa4e 100644 --- a/redhat/applications/tork/tork-14.0.0.spec +++ b/redhat/applications/tork/tork-14.0.0.spec @@ -37,7 +37,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 0.33 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: Anonymity Manager for TDE Group: Applications/Internet URL: sourceforge.net/projects/tolrk/ diff --git a/redhat/applications/twin-style-crystal/twin-style-crystal-14.0.0.spec b/redhat/applications/twin-style-crystal/twin-style-crystal-14.0.0.spec index 020e104fb..11bf5f835 100644 --- a/redhat/applications/twin-style-crystal/twin-style-crystal-14.0.0.spec +++ b/redhat/applications/twin-style-crystal/twin-style-crystal-14.0.0.spec @@ -37,7 +37,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 1.0.5 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: Semi transparant window decoration for Trinity Group: Applications/Utilities URL: http://www.trinitydesktop.org/ diff --git a/redhat/applications/twin-style-crystal/twin-style-crystal-3.5.13.2.spec b/redhat/applications/twin-style-crystal/twin-style-crystal-3.5.13.2.spec index 79136634a..3b6374983 100644 --- a/redhat/applications/twin-style-crystal/twin-style-crystal-3.5.13.2.spec +++ b/redhat/applications/twin-style-crystal/twin-style-crystal-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg twin-style-crystal %define tde_version 3.5.13.2 -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-%{tde_pkg} Summary: Semi transparant window decoration for Trinity. Version: 1.0.5 -Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities diff --git a/redhat/applications/wlassistant/wlassistant-14.0.0.spec b/redhat/applications/wlassistant/wlassistant-14.0.0.spec index ff2c05226..14fdf9a6e 100644 --- a/redhat/applications/wlassistant/wlassistant-14.0.0.spec +++ b/redhat/applications/wlassistant/wlassistant-14.0.0.spec @@ -37,7 +37,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 0.5.7 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: User friendly TDE frontend for wireless network connection Group: Applications/Utilities URL: http://wlassistant.sourceforge.net/ diff --git a/redhat/applications/wlassistant/wlassistant-3.5.13.2.spec b/redhat/applications/wlassistant/wlassistant-3.5.13.2.spec index b1a07813d..8474c5510 100644 --- a/redhat/applications/wlassistant/wlassistant-3.5.13.2.spec +++ b/redhat/applications/wlassistant/wlassistant-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg wlassistant %define tde_version 3.5.13.2 -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-%{tde_pkg} Summary: User friendly TDE frontend for wireless network connection [Trinity] Version: 0.5.7 -Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities diff --git a/redhat/applications/yakuake/yakuake-14.0.0.spec b/redhat/applications/yakuake/yakuake-14.0.0.spec index 296367838..5e4624bb5 100644 --- a/redhat/applications/yakuake/yakuake-14.0.0.spec +++ b/redhat/applications/yakuake/yakuake-14.0.0.spec @@ -37,7 +37,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 2.8.1 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: Yakuake is a Quake-style terminal emulator based on TDE Konsole technology Group: Applications/Utilities URL: http://www.trinitydesktop.org/ diff --git a/redhat/applications/yakuake/yakuake-3.5.13.2.spec b/redhat/applications/yakuake/yakuake-3.5.13.2.spec index bd9b54200..b6fbce882 100644 --- a/redhat/applications/yakuake/yakuake-3.5.13.2.spec +++ b/redhat/applications/yakuake/yakuake-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg yakuake %define tde_version 3.5.13.2 -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-%{tde_pkg} Summary: Yakuake is a Quake-style terminal emulator based on TDE Konsole technology. Version: 2.8.1 -Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities diff --git a/redhat/build/build_rpm_package.sh b/redhat/build/build_rpm_package.sh index f5242c9c5..64d10e705 100755 --- a/redhat/build/build_rpm_package.sh +++ b/redhat/build/build_rpm_package.sh @@ -63,7 +63,7 @@ fi # 3. PCLinuxOS hack ... if [ -r "/etc/pclinuxos-release" ]; then sed -i "${TEMPDIR}/${SPECFILE##*/}" \ - -e "/admin\/Makefile.common/ s|$| \|\| autoreconf -i \&\& make -f admin/Makefile.common|" \ + -e "/admin\/Makefile.common/ s|^|touch config.h.in;|" \ || exit 1 fi diff --git a/redhat/build/get_rpm_package_name.sh b/redhat/build/get_rpm_package_name.sh index 3f60d852f..ae0790e7a 100755 --- a/redhat/build/get_rpm_package_name.sh +++ b/redhat/build/get_rpm_package_name.sh @@ -24,7 +24,7 @@ case "${PKGNAME}" in # Most TDE libraries have no prefix #"libkdcraw") PREFIX="";; # 3rd party dependencies - "esound"|"fileshareset"|"hk_classes"|"python-qt3") PREFIX="";; + "dirmngr"|"esound"|"fileshareset"|"hk_classes"|"lcms"|"python-qt3") PREFIX="";; # Extra build stuff "autoconf"|"automake"|"cmake"|"gnuchess"|"htdig"|"imlib1"|"libconfig"|"libotr3"|"libtool2"|"lilypond"|"m4"|"mftrace"|"pan"|"pcsc-perl"|"torsocks"|"wv2") PREFIX="";; # Other @@ -42,28 +42,29 @@ fi case "${PKGNAME}" in # Some packages have different runtime name than source package. - "avahi-tqt") PKGRUNTIME="${lib}avahi-tqt1";; - "dbus-tqt") PKGRUNTIME="${lib}dbus-tqt-1-0";; - "dbus-1-tqt") PKGRUNTIME="${lib}dbus-1-tqt0";; - "esound") PKGRUNTIME="esound-libs";; - "imlib1") PKGRUNTIME="${lib}Imlib1";; - "koffice") PKGRUNTIME="koffice-suite";; - "libart-lgpl") PKGRUNTIME="${lib}art_lgpl_2-2";; - "libcaldav") PKGRUNTIME="${lib}caldav0";; - "libcarddav") PKGRUNTIME="${lib}carddav0";; - "libkdcraw") PKGRUNTIME="${lib}kdcraw4";; - "libkexiv2") PKGRUNTIME="${lib}kexiv2-5";; - "libkipi") PKGRUNTIME="${lib}kipi0";; - "tqscintilla") PKGRUNTIME="${lib}tqscintilla7";; - "tqca") PKGRUNTIME="${lib}tqca1";; - "tqca-tls") PKGRUNTIME="${lib}tqt3-mt-tqca-tls";; - "tqt3") PKGRUNTIME="${lib}tqt3-mt";; - "tqtinterface") PKGRUNTIME="${lib}tqt4";; + "avahi-tqt") PKGRUNTIME="${lib}avahi-tqt1";; + "dbus-tqt") PKGRUNTIME="${lib}dbus-tqt-1-0";; + "dbus-1-tqt") PKGRUNTIME="${lib}dbus-1-tqt0";; + "esound") PKGRUNTIME="esound-libs";; + "imlib1") PKGRUNTIME="${lib}Imlib1";; + "knetworkmanager8") PKGRUNTIME="knetworkmanager";; + "koffice") PKGRUNTIME="koffice-suite";; + "libart-lgpl") PKGRUNTIME="${lib}art_lgpl_2-2";; + "libcaldav") PKGRUNTIME="${lib}caldav0";; + "libcarddav") PKGRUNTIME="${lib}carddav0";; + "libkdcraw") PKGRUNTIME="${lib}kdcraw4";; + "libkexiv2") PKGRUNTIME="${lib}kexiv2-5";; + "libkipi") PKGRUNTIME="${lib}kipi0";; + "tqscintilla") PKGRUNTIME="${lib}tqscintilla7";; + "tqca") PKGRUNTIME="${lib}tqca1";; + "tqca-tls") PKGRUNTIME="${lib}tqt3-mt-tqca-tls";; + "tqt3") PKGRUNTIME="${lib}tqt3-mt";; + "tqtinterface") PKGRUNTIME="${lib}tqt4";; # Language package: install only French language package "k3b-i18n"|"koffice-i18n"|"tde-i18n") - PKGRUNTIME="${PKGNAME}-French";; + PKGRUNTIME="${PKGNAME}-French";; # Default case: runtime package has same name as source package - *) PKGRUNTIME="${PKGNAME}";; + *) PKGRUNTIME="${PKGNAME}";; esac # Finally, display the runtime package name. diff --git a/redhat/build/install_rpm_package.sh b/redhat/build/install_rpm_package.sh index 6b1319f90..7adb128a5 100755 --- a/redhat/build/install_rpm_package.sh +++ b/redhat/build/install_rpm_package.sh @@ -9,7 +9,7 @@ done PKGNAME="${1}" if [ -x /usr/bin/dnf ]; then - PKGINST="sudo dnf install -y --refresh" + PKGINST="sudo dnf install -y --refresh --nogpgcheck" elif [ -x /usr/sbin/urpmi ]; then PKGINST='sudo urpmi --auto --no-verify-rpm' elif [ -x /usr/bin/zypper ]; then diff --git a/redhat/build/is_latest_package_installed.sh b/redhat/build/is_latest_package_installed.sh index 685fa7a05..ab04bd8f7 100755 --- a/redhat/build/is_latest_package_installed.sh +++ b/redhat/build/is_latest_package_installed.sh @@ -21,7 +21,7 @@ else fi # Other package (e.g. QT3) - if [ "${INSTALLED}" = "${SPEC}" ]; then + if [ "${INSTALLED}" = "${SPEC}" ] || [ "${INSTALLED}$(rpm -E %dist)" = "${SPEC}" ]; then echo "Latest package '${PKGNAME}' version '${INSTALLED}' is already built and installed." exit 0 fi diff --git a/redhat/dependencies/akode/akode-14.0.0.spec b/redhat/dependencies/akode/akode-14.0.0.spec index 5410dea8a..3c9b0634c 100644 --- a/redhat/dependencies/akode/akode-14.0.0.spec +++ b/redhat/dependencies/akode/akode-14.0.0.spec @@ -36,11 +36,6 @@ %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} %define libakode %{_lib}akode %else @@ -52,7 +47,7 @@ Summary: Audio-decoding framework Group: System Environment/Libraries Epoch: %{tde_epoch} Version: 2.0.2 -Release: 1%{?dist}%{?_variant} +Release: 1%{?dist} URL: http://www.kde-apps.org/content/show.php?content=30375 #URL: http://carewolf.com/akode/ diff --git a/redhat/dependencies/akode/akode-3.5.13.2.spec b/redhat/dependencies/akode/akode-3.5.13.2.spec index 57c5ed631..b3738796a 100644 --- a/redhat/dependencies/akode/akode-3.5.13.2.spec +++ b/redhat/dependencies/akode/akode-3.5.13.2.spec @@ -36,17 +36,12 @@ %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - Name: trinity-akode Summary: Audio-decoding framework Group: System Environment/Libraries Epoch: %{tde_epoch} Version: 2.0.2 -Release: 1%{?dist}%{?_variant} +Release: 1%{?dist} URL: http://www.kde-apps.org/content/show.php?content=30375 #URL: http://carewolf.com/akode/ diff --git a/redhat/dependencies/arts/arts-14.0.0.spec b/redhat/dependencies/arts/arts-14.0.0.spec index 3aa4af46e..499cb1f97 100644 --- a/redhat/dependencies/arts/arts-14.0.0.spec +++ b/redhat/dependencies/arts/arts-14.0.0.spec @@ -38,16 +38,11 @@ %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 1.5.10 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: ARTS (analog realtime synthesizer) - the TDE sound system Group: System Environment/Daemons URL: http://www.trinitydesktop.org/ diff --git a/redhat/dependencies/arts/arts-3.5.13.2.spec b/redhat/dependencies/arts/arts-3.5.13.2.spec index 98e6a9b0b..a21bb01df 100644 --- a/redhat/dependencies/arts/arts-3.5.13.2.spec +++ b/redhat/dependencies/arts/arts-3.5.13.2.spec @@ -35,16 +35,11 @@ %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 1.5.10 -Release: %{?!preversion:2}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:2}%{?preversion:0_%{preversion}}%{?dist} Summary: ARTS (analog realtime synthesizer) - the TDE sound system Group: System Environment/Daemons URL: http://www.trinitydesktop.org/ diff --git a/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec b/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec index 40c63bd21..06e8deaaf 100644 --- a/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec +++ b/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec @@ -31,7 +31,7 @@ Name: trinity-avahi-tqt Epoch: %{tde_epoch} Version: 0.6.30 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: Avahi TQt integration library Group: System/Libraries URL: http://www.trinitydesktop.org/ diff --git a/redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.2.spec b/redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.2.spec index c43d65b08..4c60366aa 100644 --- a/redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.2.spec +++ b/redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.2.spec @@ -29,7 +29,7 @@ Name: trinity-avahi-tqt Epoch: %{tde_epoch} Version: 0.6.30 -Release: %{?!preversion:2}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:2}%{?preversion:0_%{preversion}}%{?dist} Summary: Avahi TQt integration library Group: System/Libraries URL: http://www.trinitydesktop.org/ diff --git a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec index 2b73e6646..b85589580 100644 --- a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec +++ b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec @@ -31,7 +31,7 @@ Name: trinity-dbus-1-tqt Epoch: %{tde_epoch} Version: 0.9 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: Dbus bindings for the Trinity Qt [TQt] interface Group: System/Libraries URL: http://www.trinitydesktop.org/ diff --git a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.2.spec b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.2.spec index ec3c54c3f..b442352c2 100644 --- a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.2.spec +++ b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.2.spec @@ -29,7 +29,7 @@ Name: trinity-dbus-1-tqt Epoch: %{tde_epoch} Version: 0.9 -Release: %{?!preversion:2}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:2}%{?preversion:0_%{preversion}}%{?dist} Summary: Dbus bindings for the Trinity Qt [TQt] interface Group: System/Libraries URL: http://www.trinitydesktop.org/ diff --git a/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec b/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec index fa7639fc1..b2a45cb52 100644 --- a/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec +++ b/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec @@ -31,7 +31,7 @@ Name: trinity-dbus-tqt Epoch: %{tde_epoch} Version: 0.63 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: Simple inter-process messaging system Group: System/Libraries URL: http://www.trinitydesktop.org/ diff --git a/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.2.spec b/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.2.spec index 70918cfd5..d71f0e8aa 100644 --- a/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.2.spec +++ b/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.2.spec @@ -29,7 +29,7 @@ Name: trinity-dbus-tqt Epoch: %{tde_epoch} Version: 0.63 -Release: %{?!preversion:2}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:2}%{?preversion:0_%{preversion}}%{?dist} Summary: Simple inter-process messaging system Group: System/Libraries URL: http://www.trinitydesktop.org/ diff --git a/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec b/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec index d57b43e99..b178fffa1 100644 --- a/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec +++ b/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec @@ -31,7 +31,7 @@ Name: trinity-libart-lgpl Version: 2.3.22 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: Library of functions for 2D graphics Group: System/Libraries URL: http://www.trinitydesktop.org/ diff --git a/redhat/dependencies/libcaldav/libcaldav-14.0.0.spec b/redhat/dependencies/libcaldav/libcaldav-14.0.0.spec index 3c060415d..8845fb7ca 100644 --- a/redhat/dependencies/libcaldav/libcaldav-14.0.0.spec +++ b/redhat/dependencies/libcaldav/libcaldav-14.0.0.spec @@ -35,7 +35,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 0.6.5 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: A client library that adds support for the CalDAV protocol (rfc4791) Group: System/Libraries URL: http://www.trinitydesktop.org/ diff --git a/redhat/dependencies/libcaldav/libcaldav-3.5.13.2.spec b/redhat/dependencies/libcaldav/libcaldav-3.5.13.2.spec index 4e909105b..a06586276 100644 --- a/redhat/dependencies/libcaldav/libcaldav-3.5.13.2.spec +++ b/redhat/dependencies/libcaldav/libcaldav-3.5.13.2.spec @@ -33,7 +33,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 0.6.5 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} Summary: A client library that adds support for the CalDAV protocol (rfc4791) Group: System/Libraries URL: http://www.trinitydesktop.org/ diff --git a/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec b/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec index 2e99ae603..e9c111d1d 100644 --- a/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec +++ b/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec @@ -35,7 +35,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 0.6.2 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: A portable CardDAV client implementation Group: System/Libraries URL: http://www.trinitydesktop.org/ diff --git a/redhat/dependencies/libcarddav/libcarddav-3.5.13.2.spec b/redhat/dependencies/libcarddav/libcarddav-3.5.13.2.spec index bbba4ad8d..bd0c965ca 100644 --- a/redhat/dependencies/libcarddav/libcarddav-3.5.13.2.spec +++ b/redhat/dependencies/libcarddav/libcarddav-3.5.13.2.spec @@ -33,7 +33,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 0.6.2 -Release: %{?!preversion:5}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:5}%{?preversion:0_%{preversion}}%{?dist} Summary: A portable CardDAV client implementation Group: System/Libraries URL: http://www.trinitydesktop.org/ diff --git a/redhat/dependencies/python-tqt/python-tqt-14.0.0.spec b/redhat/dependencies/python-tqt/python-tqt-14.0.0.spec index cc787fdfd..13ce435c9 100644 --- a/redhat/dependencies/python-tqt/python-tqt-14.0.0.spec +++ b/redhat/dependencies/python-tqt/python-tqt-14.0.0.spec @@ -38,16 +38,11 @@ %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 3.18.1 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: TQt bindings for Python Group: Development/Libraries/Python URL: http://www.trinitydesktop.org/ diff --git a/redhat/dependencies/sip4-tqt/sip4-tqt-14.0.0.spec b/redhat/dependencies/sip4-tqt/sip4-tqt-14.0.0.spec index 30edceff3..02f2e45fd 100644 --- a/redhat/dependencies/sip4-tqt/sip4-tqt-14.0.0.spec +++ b/redhat/dependencies/sip4-tqt/sip4-tqt-14.0.0.spec @@ -42,18 +42,13 @@ %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - %{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 4.10.5 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: Python/C++ bindings generator runtime library Group: Development/Tools/Building URL: http://www.trinitydesktop.org/ diff --git a/redhat/dependencies/tqca-tls/tqca-tls-14.0.0.spec b/redhat/dependencies/tqca-tls/tqca-tls-14.0.0.spec index 7c3c8bcb4..e3b193025 100644 --- a/redhat/dependencies/tqca-tls/tqca-tls-14.0.0.spec +++ b/redhat/dependencies/tqca-tls/tqca-tls-14.0.0.spec @@ -35,7 +35,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 1.0 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: TLS plugin for the TQt Cryptographic Architecture Group: Applications/Internet URL: http://delta.affinix.com/qca/ diff --git a/redhat/dependencies/tqca-tls/tqca-tls-3.5.13.2.spec b/redhat/dependencies/tqca-tls/tqca-tls-3.5.13.2.spec index 4ca936d2d..50e2b12b7 100644 --- a/redhat/dependencies/tqca-tls/tqca-tls-3.5.13.2.spec +++ b/redhat/dependencies/tqca-tls/tqca-tls-3.5.13.2.spec @@ -33,7 +33,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 1.0 -Release: %{?!preversion:4}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:4}%{?preversion:0_%{preversion}}%{?dist} Summary: TLS plugin for the TQt Cryptographic Architecture Group: Applications/Internet URL: http://delta.affinix.com/qca/ diff --git a/redhat/dependencies/tqca/tqca-14.0.0.spec b/redhat/dependencies/tqca/tqca-14.0.0.spec index 127761a45..3eeb9671a 100644 --- a/redhat/dependencies/tqca/tqca-14.0.0.spec +++ b/redhat/dependencies/tqca/tqca-14.0.0.spec @@ -35,7 +35,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 1.0 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: TQt Cryptographic Architecture Group: Development/Libraries/C and C++ URL: http://www.trinitydesktop.org/ diff --git a/redhat/dependencies/tqca/tqca-3.5.13.2.spec b/redhat/dependencies/tqca/tqca-3.5.13.2.spec index 22918d7f6..4af13e0af 100644 --- a/redhat/dependencies/tqca/tqca-3.5.13.2.spec +++ b/redhat/dependencies/tqca/tqca-3.5.13.2.spec @@ -33,7 +33,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 1.0 -Release: %{?!preversion:4}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:4}%{?preversion:0_%{preversion}}%{?dist} Summary: TQt Cryptographic Architecture Group: Development/Libraries/C and C++ URL: http://www.trinitydesktop.org/ diff --git a/redhat/dependencies/tqscintilla/tqscintilla-14.0.0.spec b/redhat/dependencies/tqscintilla/tqscintilla-14.0.0.spec index 96a2a05cb..f4c6aba1f 100644 --- a/redhat/dependencies/tqscintilla/tqscintilla-14.0.0.spec +++ b/redhat/dependencies/tqscintilla/tqscintilla-14.0.0.spec @@ -35,7 +35,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 1.7.1 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: TQt source code editing component based on Scintilla Group: Development/Libraries/C and C++ URL: http://www.trinitydesktop.org/ diff --git a/redhat/dependencies/tqt3/tqt3-14.0.0.spec b/redhat/dependencies/tqt3/tqt3-14.0.0.spec index d1e710d45..2645aa112 100644 --- a/redhat/dependencies/tqt3/tqt3-14.0.0.spec +++ b/redhat/dependencies/tqt3/tqt3-14.0.0.spec @@ -29,7 +29,7 @@ Name: trinity-tqt3 Version: 3.5.0 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: TQt GUI Library, Version 3 Group: System/GUI/Other URL: http://www.trinitydesktop.org/ @@ -137,7 +137,7 @@ BuildRequires: cups-devel %endif %if 0%{?mdkversion} || 0%{?mgaversion} %if 0%{?pclinuxos} -%define xrandr_devel libxrandr2-devel +%define xrandr_devel %{_lib}xrandr2-devel %else %define xrandr_devel libxrandr-devel %endif diff --git a/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec b/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec index 7b8406a36..49b652985 100755 --- a/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec +++ b/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec @@ -27,11 +27,6 @@ %define tde_pkg tqtinterface %define cmake_modules_dir %{_datadir}/cmake/Modules -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} %define libtqt4 %{_lib}tqt4 %else @@ -41,7 +36,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 4.2.0 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: The Trinity Qt Interface Libraries Group: System/GUI/Other URL: http://www.trinitydesktop.org/ diff --git a/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.2.spec b/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.2.spec index fbfd72ce2..f67ae2dfb 100755 --- a/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.2.spec +++ b/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.2.spec @@ -25,11 +25,6 @@ %define tde_pkg tqtinterface %define cmake_modules_dir %{_datadir}/cmake/Modules -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} %define libtqt4 %{_lib}tqt4 %else @@ -39,7 +34,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 4.2.0 -Release: %{?!preversion:3}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:3}%{?preversion:0_%{preversion}}%{?dist} Summary: The Trinity Qt Interface Libraries Group: System/GUI/Other URL: http://www.trinitydesktop.org/ diff --git a/redhat/extras/icons-nuvola/icons-nuvola-14.0.0.spec b/redhat/extras/icons-nuvola/icons-nuvola-14.0.0.spec index 26f2d1adb..8c3e5dcc0 100644 --- a/redhat/extras/icons-nuvola/icons-nuvola-14.0.0.spec +++ b/redhat/extras/icons-nuvola/icons-nuvola-14.0.0.spec @@ -21,11 +21,6 @@ %define tde_version 14.0.0 %endif -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -46,7 +41,7 @@ Name: trinity-%{tde_pkg} Summary: Nuvola icons for TDE Desktop Version: 1.0 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities diff --git a/redhat/extras/kdebluetooth/kdebluetooth.spec b/redhat/extras/kdebluetooth/kdebluetooth.spec index 25b95d31b..1ad3db23b 100644 --- a/redhat/extras/kdebluetooth/kdebluetooth.spec +++ b/redhat/extras/kdebluetooth/kdebluetooth.spec @@ -1,8 +1,3 @@ -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE 3.5.13 specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -22,7 +17,7 @@ Name: trinity-kdebluetooth Version: 1.0_beta9_r769275 -Release: 2%{?dist}%{?_variant} +Release: 2%{?dist} Summary: The TDE Bluetooth Framework diff --git a/redhat/extras/kdevmon/kdevmon-14.0.0.spec b/redhat/extras/kdevmon/kdevmon-14.0.0.spec index 9695f6f0f..becc56d67 100644 --- a/redhat/extras/kdevmon/kdevmon-14.0.0.spec +++ b/redhat/extras/kdevmon/kdevmon-14.0.0.spec @@ -21,11 +21,6 @@ %define tde_version 14.0.0 %endif -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -46,7 +41,7 @@ Name: trinity-%{tde_pkg} Summary: A utility for monitoring the throughput of one network device Version: 0.4.6 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities @@ -58,10 +53,10 @@ URL: http://www.trinitydesktop.org/ Prefix: %{_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: %{tde_pkg}-14.0.0.tar.gz +Source0: %{tde_pkg}-%{tde_version}.tar.gz BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 +BuildRequires: trinity-arts-devel >= 2:1.5.10 BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils diff --git a/redhat/extras/kdissert/kdissert-14.0.0.spec b/redhat/extras/kdissert/kdissert-14.0.0.spec index cc5a6ab8a..071a83883 100644 --- a/redhat/extras/kdissert/kdissert-14.0.0.spec +++ b/redhat/extras/kdissert/kdissert-14.0.0.spec @@ -21,11 +21,6 @@ %define tde_version 14.0.0 %endif -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -46,7 +41,7 @@ Name: trinity-%{tde_pkg} Summary: Mindmapping Tool Version: 1.0.6c -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities diff --git a/redhat/extras/kickoff-i18n/kickoff-i18n-3.5.13.1.spec b/redhat/extras/kickoff-i18n/kickoff-i18n-3.5.13.1.spec index ee835164b..2e759de43 100644 --- a/redhat/extras/kickoff-i18n/kickoff-i18n-3.5.13.1.spec +++ b/redhat/extras/kickoff-i18n/kickoff-i18n-3.5.13.1.spec @@ -1,8 +1,3 @@ -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # Speed build options %define debug_package %{nil} %define __spec_install_post %{nil} @@ -27,7 +22,7 @@ AutoReq: no Name: trinity-kickoff-i18n Summary: Kickoff translations for Trinity Desktop Environment Version: 1.0 -Release: 2%{?dist}%{?_variant} +Release: 2%{?dist} Group: System/Internationalization License: GPL URL: http://www.mandriva.com diff --git a/redhat/extras/kickoff-i18n/kickoff-i18n-3.5.13.2.spec b/redhat/extras/kickoff-i18n/kickoff-i18n-3.5.13.2.spec index a0e684814..9a75298ce 100644 --- a/redhat/extras/kickoff-i18n/kickoff-i18n-3.5.13.2.spec +++ b/redhat/extras/kickoff-i18n/kickoff-i18n-3.5.13.2.spec @@ -1,8 +1,3 @@ -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # Speed build options %define debug_package %{nil} %define __spec_install_post %{nil} @@ -27,7 +22,7 @@ AutoReq: no Name: trinity-kickoff-i18n Summary: Kickoff translations for Trinity Desktop Environment Version: 1.0 -Release: 3%{?dist}%{?_variant} +Release: 3%{?dist} Group: System/Internationalization License: GPL URL: http://www.mandriva.com diff --git a/redhat/extras/kickoff-i18n/kickoff-i18n-3.5.13.spec b/redhat/extras/kickoff-i18n/kickoff-i18n-3.5.13.spec index eb4540bd2..5872a0bbb 100644 --- a/redhat/extras/kickoff-i18n/kickoff-i18n-3.5.13.spec +++ b/redhat/extras/kickoff-i18n/kickoff-i18n-3.5.13.spec @@ -1,8 +1,3 @@ -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # Speed build options %define debug_package %{nil} %define __spec_install_post %{nil} @@ -19,7 +14,7 @@ AutoReq: no Name: trinity-kickoff-i18n Summary: Kickoff translations for Trinity Desktop Environment Version: 1.0 -Release: 1%{?dist}%{?_variant} +Release: 1%{?dist} Group: System/Internationalization License: GPL URL: http://www.mandriva.com diff --git a/redhat/extras/kitty/kitty-14.0.0.spec b/redhat/extras/kitty/kitty-14.0.0.spec index 080feb534..1c4317085 100644 --- a/redhat/extras/kitty/kitty-14.0.0.spec +++ b/redhat/extras/kitty/kitty-14.0.0.spec @@ -15,11 +15,6 @@ # Please submit bugfixes or comments via http://www.trinitydesktop.org/ # -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - %if "%{?tde_version}" == "" %define tde_version 14.0.0 %endif @@ -42,7 +37,7 @@ Summary: a TQt/TDE based RSS podcast and video aggregator Name: trinity-kitty Version: 0.9.2 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} License: GPL Group: Applications/Network diff --git a/redhat/extras/klamav/klamav-14.0.0.spec b/redhat/extras/klamav/klamav-14.0.0.spec index bc6c6b1b4..dd45f3f31 100644 --- a/redhat/extras/klamav/klamav-14.0.0.spec +++ b/redhat/extras/klamav/klamav-14.0.0.spec @@ -21,11 +21,6 @@ %define tde_version 14.0.0 %endif -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -46,7 +41,7 @@ Name: trinity-%{tde_pkg} Summary: Frontend for clamav Version: 0.46 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities @@ -59,10 +54,10 @@ Url: http://klamav.sourceforge.net/ Prefix: %{_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: %{tde_pkg}-14.0.0.tar.gz +Source0: %{tde_pkg}-%{tde_version}.tar.gz BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 +BuildRequires: trinity-arts-devel >= 2:1.5.10 BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils diff --git a/redhat/extras/klibido/klibido-14.0.0.spec b/redhat/extras/klibido/klibido-14.0.0.spec index 053f28052..2a2d521b1 100644 --- a/redhat/extras/klibido/klibido-14.0.0.spec +++ b/redhat/extras/klibido/klibido-14.0.0.spec @@ -21,11 +21,6 @@ %define tde_version 14.0.0 %endif -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -45,7 +40,7 @@ Name: trinity-%{tde_pkg} Summary: A TDE usenet news grabber for Linux. Version: 0.2.5 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} License: GPL Group: Applications/Network @@ -57,7 +52,7 @@ URL: http://klibido.sourceforge.net/ Prefix: %{tde_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: %{tde_pkg}-%{version}.tar.gz +Source0: %{tde_pkg}-%{tde_version}.tar.gz BuildRequires: trinity-tqtinterface-devel >= %{tde_version} BuildRequires: trinity-arts-devel >= 1:1.5.10 diff --git a/redhat/extras/knoda/trinity-knoda.spec b/redhat/extras/knoda/trinity-knoda.spec index 541c23b4d..871b06067 100644 --- a/redhat/extras/knoda/trinity-knoda.spec +++ b/redhat/extras/knoda/trinity-knoda.spec @@ -1,11 +1,7 @@ # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - - # TDE 3.5.13 specific building variables +%define tde_version 14.0.1 %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share %define tde_confdir %{_sysconfdir}/trinity @@ -23,7 +19,7 @@ Name: trinity-knoda Version: 0.8.3 -Release: 1%{?dist}%{?_variant} +Release: 1%{?dist} Summary: A database frontend for TDE. Group: Applications/Productivity @@ -31,7 +27,7 @@ License: GPLv2+ URL: http://sourceforge.net/projects/knoda/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: http://downloads.sourceforge.net/project/knoda/knoda/0.8.3/knoda-0.8.3.tar.gz +Source0: http://downloads.sourceforge.net/project/knoda/knoda/0.8.3/knoda-%{tde_version}.tar.gz BuildRequires: desktop-file-utils BuildRequires: trinity-tdelibs-devel @@ -52,7 +48,7 @@ Requires: %{name} = %{version}-%{release} %{summary} -%if 0%{?suse_version} +%if 0%{?suse_version} || 0%{?pclinuxos} %debug_package %endif diff --git a/redhat/extras/kompose/kompose-14.0.0.spec b/redhat/extras/kompose/kompose-14.0.0.spec index 491aede15..05dbedbae 100644 --- a/redhat/extras/kompose/kompose-14.0.0.spec +++ b/redhat/extras/kompose/kompose-14.0.0.spec @@ -21,11 +21,6 @@ %define tde_version 14.0.0 %endif -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -46,7 +41,7 @@ Name: trinity-%{tde_pkg} Summary: Full-Screen Task Manager for TDE Version: 0.5.3 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities @@ -58,7 +53,7 @@ URL: http://www.trinitydesktop.org/ Prefix: %{_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: %{tde_pkg}-14.0.0.tar.gz +Source0: %{tde_pkg}-%{tde_version}.tar.gz BuildRequires: trinity-tqtinterface-devel >= %{tde_version} BuildRequires: trinity-arts-devel >= 1:1.5.10 diff --git a/redhat/extras/koverartist/koverartist-14.0.0.spec b/redhat/extras/koverartist/koverartist-14.0.0.spec index 38f6ea51e..6d4a92dc3 100644 --- a/redhat/extras/koverartist/koverartist-14.0.0.spec +++ b/redhat/extras/koverartist/koverartist-14.0.0.spec @@ -21,11 +21,6 @@ %define tde_version 14.0.0 %endif -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -46,7 +41,7 @@ Name: trinity-%{tde_pkg} Summary: Fast Creation of CD/DVD Covers Version: 0.5 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities @@ -58,7 +53,7 @@ URL: http://www.trinitydesktop.org/ Prefix: %{_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: %{tde_pkg}-14.0.0.tar.gz +Source0: %{tde_pkg}-%{tde_version}.tar.gz BuildRequires: trinity-tqtinterface-devel >= %{tde_version} BuildRequires: trinity-arts-devel >= 1:1.5.10 diff --git a/redhat/extras/kpacman/kpacman-14.0.0.spec b/redhat/extras/kpacman/kpacman-14.0.0.spec index a30c6b6e1..b2517b9bb 100644 --- a/redhat/extras/kpacman/kpacman-14.0.0.spec +++ b/redhat/extras/kpacman/kpacman-14.0.0.spec @@ -21,11 +21,6 @@ %define tde_version 14.0.0 %endif -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_confdir %{_sysconfdir}/trinity @@ -47,7 +42,7 @@ Name: trinity-%{tde_pkg} Summary: A pacman game for the Trinity Desktop. Version: 0.3.2 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities @@ -59,7 +54,7 @@ URL: http://www.trinitydesktop.org/ Prefix: %{_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: %{tde_pkg}-14.0.0.tar.gz +Source0: %{tde_pkg}-%{tde_version}.tar.gz BuildRequires: trinity-tqtinterface-devel >= %{tde_version} BuildRequires: trinity-arts-devel >= 1:1.5.10 diff --git a/redhat/extras/style-ia-ora/style-ia-ora-14.0.0.spec b/redhat/extras/style-ia-ora/style-ia-ora-14.0.0.spec index 9920f039e..ed93d1f4d 100644 --- a/redhat/extras/style-ia-ora/style-ia-ora-14.0.0.spec +++ b/redhat/extras/style-ia-ora/style-ia-ora-14.0.0.spec @@ -21,11 +21,6 @@ %define tde_version 14.0.0 %endif -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -46,7 +41,7 @@ Name: trinity-%{tde_pkg} Summary: Mandriva theme for TDE - Widget design Version: 1.0.8 -Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist} License: GPL Group: Environment/Desktop @@ -55,7 +50,7 @@ URL: http://www.mandrivalinux.com/ Prefix: %{tde_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: %{tde_pkg}-14.0.0.tar.gz +Source0: %{tde_pkg}-%{tde_version}.tar.gz Prefix: %{_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot diff --git a/redhat/extras/theme-baghira/theme-baghira-3.5.13.1.spec b/redhat/extras/theme-baghira/theme-baghira-3.5.13.1.spec index ef5ef5c7e..7314a98e8 100644 --- a/redhat/extras/theme-baghira/theme-baghira-3.5.13.1.spec +++ b/redhat/extras/theme-baghira/theme-baghira-3.5.13.1.spec @@ -1,8 +1,3 @@ -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # Speed build options %define debug_package %{nil} %define __spec_install_post %{nil} @@ -25,7 +20,7 @@ AutoReq: no Name: trinity-theme-baghira Version: 0.8 -Release: 1%{?dist}%{?_variant} +Release: 1%{?dist} Summary: Baghira theme for Trinity License: GPL Group: Graphical desktop/KDE diff --git a/redhat/extras/theme-baghira/theme-baghira-3.5.13.2.spec b/redhat/extras/theme-baghira/theme-baghira-3.5.13.2.spec index 09dfee3b6..66fe8b315 100644 --- a/redhat/extras/theme-baghira/theme-baghira-3.5.13.2.spec +++ b/redhat/extras/theme-baghira/theme-baghira-3.5.13.2.spec @@ -1,8 +1,3 @@ -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # Speed build options %define debug_package %{nil} %define __spec_install_post %{nil} @@ -25,7 +20,7 @@ AutoReq: no Name: trinity-theme-baghira Version: 0.8 -Release: 2%{?dist}%{?_variant} +Release: 2%{?dist} Summary: Baghira theme for Trinity License: GPL Group: Graphical desktop/KDE 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 5e1e15108..7f32d520d 100644 --- a/redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec +++ b/redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec @@ -24,14 +24,13 @@ # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?tde_prefix}" != "/usr" -%define _variant .opt %define _docdir %{_datadir}/doc %define tde_datadir %{tde_prefix}/share %endif Name: trinity-desktop Version: %{tde_version} -Release: 1%{?dist}%{?_variant} +Release: 1%{?dist} License: GPL Summary: Meta-package to install TDE Group: User Interface/Desktops @@ -210,10 +209,7 @@ Requires: trinity-kpilot # Network management # RHEL 6 and openSUSE 11.x: knetworkmanager8 -%if 0%{?rhel} == 6 -Requires: trinity-knetworkmanager8 -%endif -%if 0%{?suse_version} && 0%{?suse_version} <= 1140 +%if 0%{?suse_version} && 0%{?suse_version} <= 1140 || 0%{?rhel} == 6 Requires: trinity-knetworkmanager %endif # Other distros use tdenetworkmanager (since R14) @@ -284,7 +280,7 @@ Requires: trinity-theme-baghira # GLIBC too old on RHEL <= 5 %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 6 -Requires: trinity-twinkle +#Requires: trinity-twinkle %endif %description extras diff --git a/redhat/extras/trinity-desktop/trinity-desktop-3.5.13.2.spec b/redhat/extras/trinity-desktop/trinity-desktop-3.5.13.2.spec index 0aa92d42d..c2380e215 100644 --- a/redhat/extras/trinity-desktop/trinity-desktop-3.5.13.2.spec +++ b/redhat/extras/trinity-desktop/trinity-desktop-3.5.13.2.spec @@ -1,13 +1,12 @@ # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?tde_prefix}" != "/usr" -%define _variant .opt %define _docdir %{_datadir}/doc %define tde_datadir %{tde_prefix}/share %endif Name: trinity-desktop Version: 3.5.13.2 -Release: 2%{?dist}%{?_variant} +Release: 2%{?dist} License: GPL Summary: Meta-package to install TDE Group: User Interface/Desktops diff --git a/redhat/extras/trinity-filesystem/trinity-filesystem-14.0.0.spec b/redhat/extras/trinity-filesystem/trinity-filesystem-14.0.0.spec index 43d8d31c6..d3bfc0b09 100644 --- a/redhat/extras/trinity-filesystem/trinity-filesystem-14.0.0.spec +++ b/redhat/extras/trinity-filesystem/trinity-filesystem-14.0.0.spec @@ -32,15 +32,10 @@ %define tde_libdir %{tde_prefix}/%{_lib} %define tde_tdelibdir %{tde_libdir}/trinity -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - Name: trinity-filesystem Version: %{tde_version} -Release: 1%{?dist}%{?_variant} +Release: 1%{?dist} Summary: Trinity Directory Layout Group: System/Fhs URL: http://www.trinitydesktop.org/ diff --git a/redhat/libraries/libkdcraw/libkdcraw-14.0.0.spec b/redhat/libraries/libkdcraw/libkdcraw-14.0.0.spec index afd47d217..f42f2df6a 100644 --- a/redhat/libraries/libkdcraw/libkdcraw-14.0.0.spec +++ b/redhat/libraries/libkdcraw/libkdcraw-14.0.0.spec @@ -37,7 +37,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 0.1.9 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: Raw picture decoding C++ library (runtime) [Trinity] Group: System/Libraries URL: http://www.trinitydesktop.org/ diff --git a/redhat/libraries/libkdcraw/libkdcraw-3.5.13.2.spec b/redhat/libraries/libkdcraw/libkdcraw-3.5.13.2.spec index 56c706a00..d744692f5 100644 --- a/redhat/libraries/libkdcraw/libkdcraw-3.5.13.2.spec +++ b/redhat/libraries/libkdcraw/libkdcraw-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg libkdcraw %define tde_version 3.5.13.2 -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -28,7 +23,7 @@ Summary: Raw picture decoding C++ library (runtime) [Trinity] Epoch: 1 Version: 0.1.9 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} License: GPLv2+ Group: Environment/Libraries diff --git a/redhat/libraries/libkexiv2/libkexiv2-14.0.0.spec b/redhat/libraries/libkexiv2/libkexiv2-14.0.0.spec index 63ca96773..b5edb62d8 100644 --- a/redhat/libraries/libkexiv2/libkexiv2-14.0.0.spec +++ b/redhat/libraries/libkexiv2/libkexiv2-14.0.0.spec @@ -36,11 +36,6 @@ %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} %define libkexiv %{_lib}kexiv %else @@ -53,7 +48,7 @@ Summary: Qt like interface for the libexiv2 library (runtime) [Trinity] Group: System/Libraries Epoch: 2 Version: 0.1.7 -Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist} URL: http://www.trinitydesktop.org/ %if 0%{?suse_version} diff --git a/redhat/libraries/libkexiv2/libkexiv2-3.5.13.2.spec b/redhat/libraries/libkexiv2/libkexiv2-3.5.13.2.spec index 03e4966ac..0ec2a45a0 100644 --- a/redhat/libraries/libkexiv2/libkexiv2-3.5.13.2.spec +++ b/redhat/libraries/libkexiv2/libkexiv2-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg libkexiv2 %define tde_version 3.5.13.2 -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -28,7 +23,7 @@ Summary: Qt like interface for the libexiv2 library (runtime) [Trinity] Epoch: 1 Version: 0.1.7 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} License: GPLv2+ Group: Environment/Libraries diff --git a/redhat/libraries/libkipi/libkipi-14.0.0.spec b/redhat/libraries/libkipi/libkipi-14.0.0.spec index ab361d41d..fcded5b76 100644 --- a/redhat/libraries/libkipi/libkipi-14.0.0.spec +++ b/redhat/libraries/libkipi/libkipi-14.0.0.spec @@ -36,11 +36,6 @@ %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} %define libkipi %{_lib}kipi %else @@ -53,7 +48,7 @@ Summary: Library for apps that want to use kipi-plugins (runtime version) [Trini Group: System/Libraries Epoch: %{tde_epoch} Version: 0.1.5 -Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist} URL: http://www.trinitydesktop.org/ %if 0%{?suse_version} diff --git a/redhat/libraries/libkipi/libkipi-3.5.13.2.spec b/redhat/libraries/libkipi/libkipi-3.5.13.2.spec index 156064992..101412104 100644 --- a/redhat/libraries/libkipi/libkipi-3.5.13.2.spec +++ b/redhat/libraries/libkipi/libkipi-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg libkipi %define tde_version 3.5.13.2 -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Summary: library for apps that want to use kipi-plugins (runtime version) [Trini Epoch: 1 Version: 0.1.5 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} License: GPLv2+ Group: Environment/Libraries diff --git a/redhat/libraries/libksquirrel/libksquirrel-14.0.0.spec b/redhat/libraries/libksquirrel/libksquirrel-14.0.0.spec index c374e03a6..fc4960be7 100644 --- a/redhat/libraries/libksquirrel/libksquirrel-14.0.0.spec +++ b/redhat/libraries/libksquirrel/libksquirrel-14.0.0.spec @@ -36,18 +36,13 @@ %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - Name: trinity-%{tde_pkg} Summary: Trinity image viewer Group: System/Libraries Epoch: %{tde_epoch} Version: 0.8.0 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} URL: http://www.trinitydesktop.org/ %if 0%{?suse_version} diff --git a/redhat/libraries/libksquirrel/libksquirrel-3.5.13.2.spec b/redhat/libraries/libksquirrel/libksquirrel-3.5.13.2.spec index e1d177c2d..acfc9bbbe 100644 --- a/redhat/libraries/libksquirrel/libksquirrel-3.5.13.2.spec +++ b/redhat/libraries/libksquirrel/libksquirrel-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg libksquirrel %define tde_version 3.5.13.2 -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-%{tde_pkg} Summary: Trinity image viewer Epoch: 1 Version: 0.8.0 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} License: GPLv2+ Group: Environment/Libraries diff --git a/redhat/libraries/libtdeldap/libtdeldap-14.0.0.spec b/redhat/libraries/libtdeldap/libtdeldap-14.0.0.spec index 59ab7a1fb..b7c6f0a95 100644 --- a/redhat/libraries/libtdeldap/libtdeldap-14.0.0.spec +++ b/redhat/libraries/libtdeldap/libtdeldap-14.0.0.spec @@ -36,18 +36,13 @@ %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - Name: trinity-%{tde_pkg} Summary: LDAP interface library for TDE Group: System/Libraries Epoch: %{tde_epoch} Version: 0.5 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} URL: http://www.trinitydesktop.org/ %if 0%{?suse_version} diff --git a/redhat/libraries/libtqt-perl/libtqt-perl-14.0.0.spec b/redhat/libraries/libtqt-perl/libtqt-perl-14.0.0.spec index bfb00bbae..b1aac0500 100644 --- a/redhat/libraries/libtqt-perl/libtqt-perl-14.0.0.spec +++ b/redhat/libraries/libtqt-perl/libtqt-perl-14.0.0.spec @@ -33,7 +33,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 3.008 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: Perl bindings for the TQt library Group: Development/Libraries/Perl URL: http://www.trinitydesktop.org/ diff --git a/redhat/libraries/pytdeextensions/pytdeextensions-14.0.0.spec b/redhat/libraries/pytdeextensions/pytdeextensions-14.0.0.spec index e9fd83ece..5db239ab9 100644 --- a/redhat/libraries/pytdeextensions/pytdeextensions-14.0.0.spec +++ b/redhat/libraries/pytdeextensions/pytdeextensions-14.0.0.spec @@ -37,7 +37,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 0.4.0 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: Python packages to support TDE applications (scripts) Group: Development/Libraries/Python URL: http://www.trinitydesktop.org/ diff --git a/redhat/libraries/pytdeextensions/pytdeextensions-3.5.13.2.spec b/redhat/libraries/pytdeextensions/pytdeextensions-3.5.13.2.spec index a9b5fffd9..fefe6489f 100644 --- a/redhat/libraries/pytdeextensions/pytdeextensions-3.5.13.2.spec +++ b/redhat/libraries/pytdeextensions/pytdeextensions-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_version 3.5.13.2 -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-pytdeextensions Summary: Python packages to support TDE applications (scripts) [Trinity] Version: 0.4.0 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities diff --git a/redhat/libraries/python-trinity/python-trinity-14.0.0.spec b/redhat/libraries/python-trinity/python-trinity-14.0.0.spec index 9ea993252..fc7d38c48 100644 --- a/redhat/libraries/python-trinity/python-trinity-14.0.0.spec +++ b/redhat/libraries/python-trinity/python-trinity-14.0.0.spec @@ -37,7 +37,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 3.16.3 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: Trinity bindings for Python Group: Development/Libraries/Python URL: http://www.trinitydesktop.org/ diff --git a/redhat/libraries/python-trinity/python-trinity-3.5.13.2.spec b/redhat/libraries/python-trinity/python-trinity-3.5.13.2.spec index ee6f31361..393905835 100644 --- a/redhat/libraries/python-trinity/python-trinity-3.5.13.2.spec +++ b/redhat/libraries/python-trinity/python-trinity-3.5.13.2.spec @@ -1,9 +1,5 @@ %{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif %define tde_version 3.5.13.2 # TDE specific building variables @@ -28,7 +24,7 @@ Name: trinity-python-trinity Summary: Trinity bindings for Python [Trinity] Version: 3.16.3 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities diff --git a/redhat/main/tde-i18n/tde-i18n-14.0.0.spec b/redhat/main/tde-i18n/tde-i18n-14.0.0.spec index 01f0c0f81..bc710418c 100644 --- a/redhat/main/tde-i18n/tde-i18n-14.0.0.spec +++ b/redhat/main/tde-i18n/tde-i18n-14.0.0.spec @@ -41,7 +41,7 @@ Name: trinity-%{tde_pkg} Version: %{tde_version} -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: Internationalization support for Trinity Group: User Interface/Desktops URL: http://www.trinitydesktop.org/ diff --git a/redhat/main/tde-i18n/tde-i18n-3.5.13.2.spec b/redhat/main/tde-i18n/tde-i18n-3.5.13.2.spec index dd76b2fa7..d574d91bd 100644 --- a/redhat/main/tde-i18n/tde-i18n-3.5.13.2.spec +++ b/redhat/main/tde-i18n/tde-i18n-3.5.13.2.spec @@ -41,7 +41,7 @@ Name: trinity-%{tde_pkg} Version: %{tde_version} -Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist} Summary: Internationalization support for Trinity Group: User Interface/Desktops URL: http://www.trinitydesktop.org/ diff --git a/redhat/main/tdeaccessibility/tdeaccessibility-14.0.0.spec b/redhat/main/tdeaccessibility/tdeaccessibility-14.0.0.spec index f700d2b65..89701e8d9 100644 --- a/redhat/main/tdeaccessibility/tdeaccessibility-14.0.0.spec +++ b/redhat/main/tdeaccessibility/tdeaccessibility-14.0.0.spec @@ -37,16 +37,11 @@ %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - Name: trinity-tdeaccessibility Summary: Trinity Desktop Environment - Accessibility Version: %{tde_version} -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Group: System/GUI/Other URL: http://www.trinitydesktop.org/ diff --git a/redhat/main/tdeaccessibility/tdeaccessibility-3.5.13.2.spec b/redhat/main/tdeaccessibility/tdeaccessibility-3.5.13.2.spec index 1b931d179..7ad0a0072 100644 --- a/redhat/main/tdeaccessibility/tdeaccessibility-3.5.13.2.spec +++ b/redhat/main/tdeaccessibility/tdeaccessibility-3.5.13.2.spec @@ -34,16 +34,11 @@ %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - Name: trinity-tdeaccessibility Summary: Trinity Desktop Environment - Accessibility Version: %{tde_version} -Release: %{?!preversion:3}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:3}%{?preversion:0_%{preversion}}%{?dist} Group: System/GUI/Other URL: http://www.trinitydesktop.org/ diff --git a/redhat/main/tdeaddons/tdeaddons-14.0.0.spec b/redhat/main/tdeaddons/tdeaddons-14.0.0.spec index a2a61abb4..4a913815e 100644 --- a/redhat/main/tdeaddons/tdeaddons-14.0.0.spec +++ b/redhat/main/tdeaddons/tdeaddons-14.0.0.spec @@ -35,16 +35,11 @@ %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - Name: trinity-%{tde_pkg} Summary: Trinity Desktop Environment - Plugins Version: %{tde_version} -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Group: User Interface/Desktops URL: http://www.trinitydesktop.org/ diff --git a/redhat/main/tdeaddons/tdeaddons-3.5.13.2.spec b/redhat/main/tdeaddons/tdeaddons-3.5.13.2.spec index 4dca62ca8..9ef8695cf 100644 --- a/redhat/main/tdeaddons/tdeaddons-3.5.13.2.spec +++ b/redhat/main/tdeaddons/tdeaddons-3.5.13.2.spec @@ -1,8 +1,3 @@ -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - %define tde_version 3.5.13.2 # TDE specific building variables @@ -22,7 +17,7 @@ Name: trinity-tdeaddons Summary: Trinity Desktop Environment - Plugins Version: %{tde_version} -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} License: GPLv2 Group: User Interface/Desktops diff --git a/redhat/main/tdeadmin/tdeadmin-14.0.0.spec b/redhat/main/tdeadmin/tdeadmin-14.0.0.spec index 909877ab2..368520b95 100644 --- a/redhat/main/tdeadmin/tdeadmin-14.0.0.spec +++ b/redhat/main/tdeadmin/tdeadmin-14.0.0.spec @@ -39,16 +39,11 @@ %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - Name: trinity-%{tde_pkg} Summary: Administrative tools for TDE Version: %{tde_version} -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Group: System/GUI/Other URL: http://www.trinitydesktop.org/ diff --git a/redhat/main/tdeadmin/tdeadmin-3.5.13.2.spec b/redhat/main/tdeadmin/tdeadmin-3.5.13.2.spec index 301e6a915..36a211cfe 100644 --- a/redhat/main/tdeadmin/tdeadmin-3.5.13.2.spec +++ b/redhat/main/tdeadmin/tdeadmin-3.5.13.2.spec @@ -40,7 +40,7 @@ Name: trinity-%{tde_pkg} Summary: Administrative tools for TDE Version: %{tde_version} -Release: %{?!preversion:3}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:3}%{?preversion:0_%{preversion}}%{?dist} Group: System/GUI/Other URL: http://www.trinitydesktop.org/ diff --git a/redhat/main/tdeartwork/tdeartwork-14.0.0.spec b/redhat/main/tdeartwork/tdeartwork-14.0.0.spec index 899dfdab3..2cb253234 100644 --- a/redhat/main/tdeartwork/tdeartwork-14.0.0.spec +++ b/redhat/main/tdeartwork/tdeartwork-14.0.0.spec @@ -37,16 +37,11 @@ %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - Name: trinity-%{tde_pkg} Summary: Additional artwork (themes, sound themes, ...) for TDE Version: %{tde_version} -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Group: System/GUI/Other URL: http://www.trinitydesktop.org/ @@ -749,13 +744,18 @@ This package is part of Trinity, and a component of the TDE artwork module. %{tde_datadir}/applnk/System/ScreenSavers/tessellimage.desktop %endif -%if 0%{?fedora} >= 20 +%if 0%{?fedora} >= 20 || 0%{?pclinuxos} %{tde_datadir}/applnk/System/ScreenSavers/winduprobot.desktop %{tde_datadir}/applnk/System/ScreenSavers/binaryring.desktop %{tde_datadir}/applnk/System/ScreenSavers/cityflow.desktop %{tde_datadir}/applnk/System/ScreenSavers/geodesicgears.desktop %endif +%if 0%{?pclinuxos} || 0%{?fedora} >= 21 +%{tde_datadir}/applnk/System/ScreenSavers/romanboy.desktop +%{tde_datadir}/applnk/System/ScreenSavers/splitflap.desktop +%endif + %endif ########## diff --git a/redhat/main/tdeartwork/tdeartwork-3.5.13.2.spec b/redhat/main/tdeartwork/tdeartwork-3.5.13.2.spec index 87f00043e..02f892fae 100644 --- a/redhat/main/tdeartwork/tdeartwork-3.5.13.2.spec +++ b/redhat/main/tdeartwork/tdeartwork-3.5.13.2.spec @@ -1,8 +1,3 @@ -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - %define tde_version 3.5.13.2 # TDE specific building variables @@ -23,7 +18,7 @@ Name: trinity-tdeartwork Summary: Additional artwork (themes, sound themes, ...) for TDE Version: %{tde_version} -Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist} License: GPLv2 Group: User Interface/Desktops diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos b/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2015 index 0a37e6e13..0a37e6e13 100644 --- a/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos +++ b/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2015 diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.pclos b/redhat/main/tdebase/pamd.kdm-trinity-np.pclos2015 index 690b4df08..690b4df08 100644 --- a/redhat/main/tdebase/pamd.kdm-trinity-np.pclos +++ b/redhat/main/tdebase/pamd.kdm-trinity-np.pclos2015 diff --git a/redhat/main/tdebase/pamd.kdm-trinity.pclos b/redhat/main/tdebase/pamd.kdm-trinity.pclos2015 index 87d080f58..87d080f58 100644 --- a/redhat/main/tdebase/pamd.kdm-trinity.pclos +++ b/redhat/main/tdebase/pamd.kdm-trinity.pclos2015 diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos b/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2015 index 0a37e6e13..0a37e6e13 100644 --- a/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos +++ b/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2015 diff --git a/redhat/main/tdebase/tdebase-14.0.0.spec b/redhat/main/tdebase/tdebase-14.0.0.spec index 409761703..2eef6ba9f 100644 --- a/redhat/main/tdebase/tdebase-14.0.0.spec +++ b/redhat/main/tdebase/tdebase-14.0.0.spec @@ -37,15 +37,10 @@ %define tdm_datadir %{tde_datadir}/apps/%{tdm} %define starttde starttde -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - Name: trinity-%{tde_pkg} Version: %{tde_version} -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: Trinity Base Programs Group: System/GUI/Other URL: http://www.trinitydesktop.org/ @@ -3621,7 +3616,7 @@ fi %endif %{!?with_kbdledsync:-DBUILD_TDEKBDLEDSYNC=OFF} \ %{!?with_tsak:-DBUILD_TSAK=OFF} \ -%if 0%{?fedora} >= 22 +%if 0%{?fedora} >= 22 || 0%{?suse_version} >= 1320 -DHTDIG_SEARCH_BINARY="/usr/bin/htdig" \ %endif .. diff --git a/redhat/main/tdebase/tdebase-3.5.13.2.spec b/redhat/main/tdebase/tdebase-3.5.13.2.spec index afd87bfef..bfc75ba13 100644 --- a/redhat/main/tdebase/tdebase-3.5.13.2.spec +++ b/redhat/main/tdebase/tdebase-3.5.13.2.spec @@ -34,15 +34,10 @@ %define tdm_datadir %{tde_datadir}/apps/%{tdm} %define starttde startkde -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - Name: trinity-%{tde_pkg} Version: %{tde_version} -Release: %{?!preversion:5}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:5}%{?preversion:0_%{preversion}}%{?dist} Summary: Trinity Base Programs Group: System/GUI/Other URL: http://www.trinitydesktop.org/ diff --git a/redhat/main/tdebindings/tdebindings-14.0.0.spec b/redhat/main/tdebindings/tdebindings-14.0.0.spec index 7306d534c..7bb391cf5 100644 --- a/redhat/main/tdebindings/tdebindings-14.0.0.spec +++ b/redhat/main/tdebindings/tdebindings-14.0.0.spec @@ -37,11 +37,6 @@ %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # Special note for RHEL4: # You must create symlink 'libgcj.so' manually because it does not exist by default. # E.g: @@ -52,7 +47,7 @@ Name: trinity-%{tde_pkg} Summary: TDE bindings to non-C++ languages Version: %{tde_version} -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Group: System/GUI/Other URL: http://www.trinitydesktop.org/ diff --git a/redhat/main/tdebindings/tdebindings-3.5.13.2.spec b/redhat/main/tdebindings/tdebindings-3.5.13.2.spec index 5bb286dd6..ea0e244c3 100644 --- a/redhat/main/tdebindings/tdebindings-3.5.13.2.spec +++ b/redhat/main/tdebindings/tdebindings-3.5.13.2.spec @@ -35,11 +35,6 @@ %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # Special note for RHEL4: # You must create symlink 'libgcj.so' manually because it does not exist by default. # E.g: @@ -50,7 +45,7 @@ Name: trinity-%{tde_pkg} Summary: TDE bindings to non-C++ languages Version: %{tde_version} -Release: %{?!preversion:3}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:3}%{?preversion:0_%{preversion}}%{?dist} Group: System/GUI/Other URL: http://www.trinitydesktop.org/ diff --git a/redhat/main/tdeedu/tdeedu-14.0.0.spec b/redhat/main/tdeedu/tdeedu-14.0.0.spec index f2e573cd5..08baee65a 100644 --- a/redhat/main/tdeedu/tdeedu-14.0.0.spec +++ b/redhat/main/tdeedu/tdeedu-14.0.0.spec @@ -38,17 +38,12 @@ %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - Name: trinity-%{tde_pkg} Summary: Educational/Edutainment applications Group: System/GUI/Other Version: %{tde_version} -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} URL: http://www.trinitydesktop.org/ %if 0%{?suse_version} diff --git a/redhat/main/tdeedu/tdeedu-3.5.13.2.spec b/redhat/main/tdeedu/tdeedu-3.5.13.2.spec index 3c9a88fce..a2a9faed1 100644 --- a/redhat/main/tdeedu/tdeedu-3.5.13.2.spec +++ b/redhat/main/tdeedu/tdeedu-3.5.13.2.spec @@ -1,8 +1,3 @@ -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - %define tde_version 3.5.13.2 # TDE specific building variables @@ -22,7 +17,7 @@ Name: trinity-tdeedu Summary: Educational/Edutainment applications Version: %{tde_version} -Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist} License: GPLv2 Group: Amusements/Games diff --git a/redhat/main/tdegames/tdegames-14.0.0.spec b/redhat/main/tdegames/tdegames-14.0.0.spec index 1d4ccca19..2acf792df 100644 --- a/redhat/main/tdegames/tdegames-14.0.0.spec +++ b/redhat/main/tdegames/tdegames-14.0.0.spec @@ -37,16 +37,11 @@ %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - Name: trinity-%{tde_pkg} Summary: Trinity Desktop Environment - Games Version: %{tde_version} -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Group: System/GUI/Other URL: http://www.trinitydesktop.org/ diff --git a/redhat/main/tdegames/tdegames-3.5.13.2.spec b/redhat/main/tdegames/tdegames-3.5.13.2.spec index 38898281a..6af78c586 100644 --- a/redhat/main/tdegames/tdegames-3.5.13.2.spec +++ b/redhat/main/tdegames/tdegames-3.5.13.2.spec @@ -34,16 +34,11 @@ %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - Name: trinity-%{tde_pkg} Summary: Trinity Desktop Environment - Games Version: %{tde_version} -Release: %{?!preversion:4}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:4}%{?preversion:0_%{preversion}}%{?dist} Group: System/GUI/Other URL: http://www.trinitydesktop.org/ diff --git a/redhat/main/tdegraphics/tdegraphics-14.0.0.spec b/redhat/main/tdegraphics/tdegraphics-14.0.0.spec index 1a1f89498..e78b50a7c 100644 --- a/redhat/main/tdegraphics/tdegraphics-14.0.0.spec +++ b/redhat/main/tdegraphics/tdegraphics-14.0.0.spec @@ -33,15 +33,10 @@ %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - Name: trinity-%{tde_pkg} Version: %{tde_version} -Release: %{?!preversion:2}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:2}%{?preversion:0_%{preversion}}%{?dist} Summary: Trinity Desktop Environment - Graphics Applications Group: Productivity/Graphics/Viewers URL: http://www.trinitydesktop.org/ diff --git a/redhat/main/tdegraphics/tdegraphics-3.5.13.2.spec b/redhat/main/tdegraphics/tdegraphics-3.5.13.2.spec index f75915f34..f1c2122a5 100644 --- a/redhat/main/tdegraphics/tdegraphics-3.5.13.2.spec +++ b/redhat/main/tdegraphics/tdegraphics-3.5.13.2.spec @@ -1,8 +1,3 @@ -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - %define tde_version 3.5.13.2 # TDE specific building variables @@ -22,7 +17,7 @@ Name: trinity-tdegraphics Version: %{tde_version} -Release: %{?!preversion:3}%{?preversion:2_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:3}%{?preversion:2_%{preversion}}%{?dist} License: GPL Summary: Trinity Desktop Environment - Graphics Applications diff --git a/redhat/main/tdelibs/tdelibs-14.0.0.spec b/redhat/main/tdelibs/tdelibs-14.0.0.spec index a65a417ca..c742190dd 100644 --- a/redhat/main/tdelibs/tdelibs-14.0.0.spec +++ b/redhat/main/tdelibs/tdelibs-14.0.0.spec @@ -37,15 +37,10 @@ %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - Name: trinity-%{tde_pkg} Version: %{tde_version} -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: TDE Libraries Group: System/GUI/Other URL: http://www.trinitydesktop.org/ diff --git a/redhat/main/tdelibs/tdelibs-3.5.13.2.spec b/redhat/main/tdelibs/tdelibs-3.5.13.2.spec index 1cf7d8bed..959157da6 100644 --- a/redhat/main/tdelibs/tdelibs-3.5.13.2.spec +++ b/redhat/main/tdelibs/tdelibs-3.5.13.2.spec @@ -36,16 +36,11 @@ %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: %{tde_version} -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: TDE Libraries Group: System/GUI/Other URL: http://www.trinitydesktop.org/ diff --git a/redhat/main/tdemultimedia/tdemultimedia-14.0.0.spec b/redhat/main/tdemultimedia/tdemultimedia-14.0.0.spec index 60177e324..a1b73e25d 100644 --- a/redhat/main/tdemultimedia/tdemultimedia-14.0.0.spec +++ b/redhat/main/tdemultimedia/tdemultimedia-14.0.0.spec @@ -36,16 +36,11 @@ %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - Name: trinity-%{tde_pkg} Summary: Multimedia applications for the Trinity Desktop Environment Version: %{tde_version} -Release: %{?!preversion:2}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Group: Productivity/Multimedia/Sound/Utilities URL: http://www.trinitydesktop.org/ diff --git a/redhat/main/tdemultimedia/tdemultimedia-3.5.13.2.spec b/redhat/main/tdemultimedia/tdemultimedia-3.5.13.2.spec index d2c9b44e8..085903bab 100644 --- a/redhat/main/tdemultimedia/tdemultimedia-3.5.13.2.spec +++ b/redhat/main/tdemultimedia/tdemultimedia-3.5.13.2.spec @@ -34,16 +34,11 @@ %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - Name: trinity-%{tde_pkg} Summary: Multimedia applications for the Trinity Desktop Environment (TDE) Version: %{tde_version} -Release: %{?!preversion:6}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:6}%{?preversion:0_%{preversion}}%{?dist} Group: Productivity/Multimedia/Sound/Utilities URL: http://www.trinitydesktop.org/ diff --git a/redhat/main/tdenetwork/tdenetwork-14.0.0.spec b/redhat/main/tdenetwork/tdenetwork-14.0.0.spec index 82b3d5dac..ab72ef950 100644 --- a/redhat/main/tdenetwork/tdenetwork-14.0.0.spec +++ b/redhat/main/tdenetwork/tdenetwork-14.0.0.spec @@ -39,11 +39,6 @@ %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # Avoids relinking, which breaks consolehelper %define dont_relink 1 @@ -52,7 +47,7 @@ Name: trinity-%{tde_pkg} Summary: Trinity Desktop Environment - Network Applications Group: Applications/Internet Version: %{tde_version} -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} URL: http://www.trinitydesktop.org/ %if 0%{?suse_version} diff --git a/redhat/main/tdenetwork/tdenetwork-3.5.13.2.spec b/redhat/main/tdenetwork/tdenetwork-3.5.13.2.spec index d9af44ab2..d3099a57e 100644 --- a/redhat/main/tdenetwork/tdenetwork-3.5.13.2.spec +++ b/redhat/main/tdenetwork/tdenetwork-3.5.13.2.spec @@ -36,11 +36,6 @@ %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # Avoids relinking, which breaks consolehelper %define dont_relink 1 @@ -49,7 +44,7 @@ Name: trinity-%{tde_pkg} Summary: Trinity Desktop Environment - Network Applications Group: Applications/Internet Version: %{tde_version} -Release: %{?!preversion:4}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:4}%{?preversion:0_%{preversion}}%{?dist} URL: http://www.trinitydesktop.org/ %if 0%{?suse_version} diff --git a/redhat/main/tdepim/tdepim-14.0.0.spec b/redhat/main/tdepim/tdepim-14.0.0.spec index 251f93cdb..0c176e041 100644 --- a/redhat/main/tdepim/tdepim-14.0.0.spec +++ b/redhat/main/tdepim/tdepim-14.0.0.spec @@ -37,11 +37,6 @@ %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # KDEPIM specific features %if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} @@ -56,7 +51,7 @@ BuildRequires: gnokii-devel Name: trinity-%{tde_pkg} Summary: Personal Information Management apps from the official Trinity release Version: %{tde_version} -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Group: Applications/Productivity URL: http://www.trinitydesktop.org/ @@ -2292,6 +2287,11 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : %prep %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} +# Fix 'ical2vcal' contains '/bin/perl' instead of '/usr/bin/perl' +if [ -x /usr/bin/perl ]; then + %__sed -i "korganizer/ical2vcal.in" -e "s|@PERL@|/usr/bin/perl|" +fi + %build unset QTDIR QTINC QTLIB diff --git a/redhat/main/tdepim/tdepim-3.5.13.2.spec b/redhat/main/tdepim/tdepim-3.5.13.2.spec index 39194a7f1..d7fcb7e6e 100644 --- a/redhat/main/tdepim/tdepim-3.5.13.2.spec +++ b/redhat/main/tdepim/tdepim-3.5.13.2.spec @@ -34,11 +34,6 @@ %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # KDEPIM specific features %if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} @@ -53,7 +48,7 @@ BuildRequires: gnokii-devel Name: trinity-%{tde_pkg} Summary: Personal Information Management apps from the official Trinity release Version: %{tde_version} -Release: %{?!preversion:4}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:4}%{?preversion:0_%{preversion}}%{?dist} Group: Applications/Productivity URL: http://www.trinitydesktop.org/ diff --git a/redhat/main/tdesdk/tdesdk-14.0.0.spec b/redhat/main/tdesdk/tdesdk-14.0.0.spec index fae45ae81..122a55c3b 100644 --- a/redhat/main/tdesdk/tdesdk-14.0.0.spec +++ b/redhat/main/tdesdk/tdesdk-14.0.0.spec @@ -37,17 +37,12 @@ %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - Name: trinity-%{tde_pkg} Summary: The Trinity Software Development Kit (SDK) Group: Development/Tools/Other Version: %{tde_version} -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} URL: http://www.trinitydesktop.org/ %if 0%{?suse_version} diff --git a/redhat/main/tdesdk/tdesdk-3.5.13.2.spec b/redhat/main/tdesdk/tdesdk-3.5.13.2.spec index 84fd15625..58a3eac62 100644 --- a/redhat/main/tdesdk/tdesdk-3.5.13.2.spec +++ b/redhat/main/tdesdk/tdesdk-3.5.13.2.spec @@ -35,17 +35,12 @@ %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - Name: trinity-%{tde_pkg} Summary: The Trinity Software Development Kit (SDK) Group: Development/Tools/Other Version: %{tde_version} -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} URL: http://www.trinitydesktop.org/ %if 0%{?suse_version} diff --git a/redhat/main/tdetoys/tdetoys-14.0.0.spec b/redhat/main/tdetoys/tdetoys-14.0.0.spec index a6bc435f8..e6eb33add 100644 --- a/redhat/main/tdetoys/tdetoys-14.0.0.spec +++ b/redhat/main/tdetoys/tdetoys-14.0.0.spec @@ -35,16 +35,11 @@ %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - Name: trinity-%{tde_pkg} Summary: Trinity Desktop Environment - Toys and Amusements Version: %{tde_version} -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Group: Amusements/Graphics URL: http://www.trinitydesktop.org/ diff --git a/redhat/main/tdetoys/tdetoys-3.5.13.2.spec b/redhat/main/tdetoys/tdetoys-3.5.13.2.spec index aa31d8b07..fff0c3f45 100644 --- a/redhat/main/tdetoys/tdetoys-3.5.13.2.spec +++ b/redhat/main/tdetoys/tdetoys-3.5.13.2.spec @@ -1,8 +1,3 @@ -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - %define tde_version 3.5.13.2 # TDE specific building variables @@ -24,7 +19,7 @@ Summary: Trinity Desktop Environment - Toys and Amusements Name: trinity-tdetoys Group: Amusements/Graphics Version: %{tde_version} -Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist} License: GPLv2+ Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz diff --git a/redhat/main/tdeutils/tdeutils-14.0.0.spec b/redhat/main/tdeutils/tdeutils-14.0.0.spec index 32ab5e171..25e7c3db4 100644 --- a/redhat/main/tdeutils/tdeutils-14.0.0.spec +++ b/redhat/main/tdeutils/tdeutils-14.0.0.spec @@ -37,16 +37,11 @@ %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - Name: trinity-%{tde_pkg} Summary: TDE Utilities Version: %{tde_version} -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Group: Applications/System URL: http://www.trinitydesktop.org/ diff --git a/redhat/main/tdeutils/tdeutils-3.5.13.2.spec b/redhat/main/tdeutils/tdeutils-3.5.13.2.spec index b8ed9aa9f..f6c96b1fe 100644 --- a/redhat/main/tdeutils/tdeutils-3.5.13.2.spec +++ b/redhat/main/tdeutils/tdeutils-3.5.13.2.spec @@ -1,8 +1,3 @@ -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - %define tde_version 3.5.13.2 # TDE specific building variables @@ -22,7 +17,7 @@ Name: trinity-tdeutils Version: %{tde_version} -Release: %{?!preversion:3}%{?preversion:2_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:3}%{?preversion:2_%{preversion}}%{?dist} License: GPL Summary: TDE Utilities Group: Applications/System diff --git a/redhat/main/tdevelop/tdevelop-14.0.0.spec b/redhat/main/tdevelop/tdevelop-14.0.0.spec index 44c3191e9..b57cc824b 100644 --- a/redhat/main/tdevelop/tdevelop-14.0.0.spec +++ b/redhat/main/tdevelop/tdevelop-14.0.0.spec @@ -37,16 +37,11 @@ %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - Name: trinity-%{tde_pkg} Summary: Integrated Development Environment for C++/C Version: %{tde_version} -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Group: Development/Tools URL: http://www.trinitydesktop.org/ diff --git a/redhat/main/tdevelop/tdevelop-3.5.13.2.spec b/redhat/main/tdevelop/tdevelop-3.5.13.2.spec index 0512ee562..74226bce6 100644 --- a/redhat/main/tdevelop/tdevelop-3.5.13.2.spec +++ b/redhat/main/tdevelop/tdevelop-3.5.13.2.spec @@ -38,7 +38,7 @@ Name: trinity-%{tde_pkg} Summary: Integrated Development Environment for C++/C Version: %{tde_version} -Release: %{?!preversion:4}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:4}%{?preversion:0_%{preversion}}%{?dist} Group: Development/Tools URL: http://www.trinitydesktop.org/ diff --git a/redhat/main/tdewebdev/tdewebdev-14.0.0.spec b/redhat/main/tdewebdev/tdewebdev-14.0.0.spec index f48207625..8972259f8 100644 --- a/redhat/main/tdewebdev/tdewebdev-14.0.0.spec +++ b/redhat/main/tdewebdev/tdewebdev-14.0.0.spec @@ -36,17 +36,12 @@ %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - Name: trinity-%{tde_pkg} Summary: Web development applications Group: Applications/Editors Version: %{tde_version} -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} URL: http://www.trinitydesktop.org/ %if 0%{?suse_version} diff --git a/redhat/main/tdewebdev/tdewebdev-3.5.13.2.spec b/redhat/main/tdewebdev/tdewebdev-3.5.13.2.spec index ae6558596..06bd3e909 100644 --- a/redhat/main/tdewebdev/tdewebdev-3.5.13.2.spec +++ b/redhat/main/tdewebdev/tdewebdev-3.5.13.2.spec @@ -1,8 +1,3 @@ -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - %define tde_version 3.5.13.2 # TDE specific building variables @@ -22,7 +17,7 @@ Name: trinity-tdewebdev Version: %{tde_version} -Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist} License: GPL Summary: Web development applications Group: Applications/Editors diff --git a/redhat/packages.f21 b/redhat/packages.f21 index 9b42808bb..263098527 100644 --- a/redhat/packages.f21 +++ b/redhat/packages.f21 @@ -39,7 +39,6 @@ fribidi-devel gamin-devel gcc gcc-c++ -gcc-java gettext-devel glib-devel gmp-devel @@ -63,7 +62,6 @@ imake imlib-devel jack-audio-connection-kit-devel jasper-devel -java-1.4.2-gcj-compat-devel java-1.8.0-openjdk-devel java-devel java-openjdk @@ -81,7 +79,6 @@ libdb-devel libdvdread-devel libfontenc-devel libgadu-devel -libgcj-devel libgpod-devel libgsf-devel libical-devel @@ -200,3 +197,11 @@ libudisks2-devel htdig libconfig-devel gtk3-devel +usbutils +gmime-devel +intltool +clamav +clamav-devel +xbase-devel +sqlite2-devel +imlib2-devel diff --git a/redhat/packages.f22 b/redhat/packages.f22 index 2ea9b4b57..317141219 100644 --- a/redhat/packages.f22 +++ b/redhat/packages.f22 @@ -197,3 +197,4 @@ libudisks2-devel htdig libconfig-devel gtk3-devel +usbutils diff --git a/redhat/packages.mga4 b/redhat/packages.mga4 index 426b00c9b..500e3f758 100644 --- a/redhat/packages.mga4 +++ b/redhat/packages.mga4 @@ -210,3 +210,10 @@ fdupes firebird-devel GraphicsMagick-devel dssi-devel +clamav +clamav-devel +gmime-devel +intltool +libpx-devel +xbase-devel +imlib2-devel |