diff --git a/po/as.po b/po/as.po index b8df6c4..2a7e7da 100644 --- a/po/as.po +++ b/po/as.po @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-02-04 08:45-0500\n" -"PO-Revision-Date: 2014-02-06 11:15-0500\n" -"Last-Translator: John Sefler \n" +"PO-Revision-Date: 2014-02-28 04:29-0500\n" +"Last-Translator: ngoswami \n" "Language-Team: Assamese\n" "Language: as\n" "MIME-Version: 1.0\n" @@ -202,7 +202,7 @@ msgstr "%%prog %s [বিকল্পসমূহ]" #: ../src/subscription_manager/cli.py:93 #, python-format msgid "Usage: %s MODULE-NAME [MODULE-OPTIONS] [--help]" -msgstr "ব্যৱহাৰ: %s MODULE-NAME [MODULE-OPTIONS] [--help]" +msgstr "Usage: %s MODULE-NAME [MODULE-OPTIONS] [--help]" # translation auto-copied from project subscription-manager, version 1.9.X, document keys, author ngoswami #: ../src/subscription_manager/cli.py:105 diff --git a/po/bn_IN.po b/po/bn_IN.po index b251625..b1d9591 100644 --- a/po/bn_IN.po +++ b/po/bn_IN.po @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-02-04 08:45-0500\n" -"PO-Revision-Date: 2014-02-05 05:41-0500\n" -"Last-Translator: John Sefler \n" +"PO-Revision-Date: 2014-02-28 03:03-0500\n" +"Last-Translator: bnin \n" "Language-Team: Bengali (India)\n" "Language: bn-IN\n" "MIME-Version: 1.0\n" @@ -4416,7 +4416,7 @@ msgid "" "You will need to use Red Hat Subscription Manager to manually attach " "subscriptions to this system after completing firstboot." msgstr "" -"Firstboot সমাপ্ত করার পরে, সিস্টেমের সাথে স্বয়ং সাবস্ক্রিপশন যোগ করার জন্য Red Hat " +"firstboot সমাপ্ত করার পরে, সিস্টেমের সাথে স্বয়ং সাবস্ক্রিপশন যোগ করার জন্য Red Hat " "Subscription Manager ব্যবহার করা আবশ্যক।" # translation auto-copied from project subscription-manager, version 1.9.X, document keys diff --git a/po/de_DE.po b/po/de_DE.po index 7e4c497..cc98d56 100644 --- a/po/de_DE.po +++ b/po/de_DE.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-02-04 08:45-0500\n" -"PO-Revision-Date: 2014-02-05 10:53-0500\n" +"PO-Revision-Date: 2014-02-27 06:32-0500\n" "Last-Translator: John Sefler \n" "Language-Team: German (Germany)\n" "Language: de-DE\n" @@ -4497,7 +4497,7 @@ msgid "" "You will need to use Red Hat Subscription Manager to manually attach " "subscriptions to this system after completing firstboot." msgstr "" -"Sie müssen dieses System nach Abschluss von Firstboot mithilfe des Red Hat " +"Sie müssen dieses System nach Abschluss von firstboot mithilfe des Red Hat " "Subscription Managers manuell mit Subskriptionen verknüpfen." # translation auto-copied from project subscription-manager, version 1.9.X, document keys diff --git a/po/es_ES.po b/po/es_ES.po index 5ab1208..19992c8 100644 --- a/po/es_ES.po +++ b/po/es_ES.po @@ -10,8 +10,8 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-02-04 08:45-0500\n" -"PO-Revision-Date: 2014-02-05 10:59-0500\n" -"Last-Translator: John Sefler \n" +"PO-Revision-Date: 2014-02-27 08:38-0500\n" +"Last-Translator: Gladys Guerrero Lozano \n" "Language-Team: Spanish (Spain)\n" "Language: es-ES\n" "MIME-Version: 1.0\n" @@ -1182,7 +1182,7 @@ msgstr "" # translation auto-copied from project subscription-manager, version 1.9.X, document keys, author Gladys Guerrero Lozano #: ../src/subscription_manager/managercli.py:1466 msgid "Deprecated, see attach" -msgstr "Depreciado, ver vincular" +msgstr "Depreciado, ver attach" # translation auto-copied from project subscription-manager, version 1.9.X, document keys #: ../src/subscription_manager/managercli.py:1484 @@ -4483,7 +4483,7 @@ msgid "" msgstr "" "Necesitará utilizar el Gestor de suscripciones de Red Hat para vincular " "manualmente suscripciones a este sistema después de completar el primer " -"inicio." +"inicio. " # translation auto-copied from project subscription-manager, version 1.9.X, document keys, author Gladys Guerrero Lozano #: ../src/subscription_manager/gui/data/manually_subscribe.glade.h:2 diff --git a/po/hi.po b/po/hi.po index 0efd932..9e60df7 100644 --- a/po/hi.po +++ b/po/hi.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-02-04 08:45-0500\n" -"PO-Revision-Date: 2014-02-06 05:33-0500\n" -"Last-Translator: John Sefler \n" +"PO-Revision-Date: 2014-02-28 05:15-0500\n" +"Last-Translator: rajesh \n" "Language-Team: Hindi \n" "Language: hi\n" "MIME-Version: 1.0\n" diff --git a/po/kn.po b/po/kn.po index 9b3b601..e0089e5 100644 --- a/po/kn.po +++ b/po/kn.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-02-04 08:45-0500\n" -"PO-Revision-Date: 2014-02-05 06:44-0500\n" +"PO-Revision-Date: 2014-02-28 03:05-0500\n" "Last-Translator: shanky \n" "Language-Team: Kannada\n" "Language: kn\n" @@ -201,7 +201,7 @@ msgstr "%%prog %s [ಆಯ್ಕೆಗಳು]" #: ../src/subscription_manager/cli.py:93 #, python-format msgid "Usage: %s MODULE-NAME [MODULE-OPTIONS] [--help]" -msgstr "ಬಳಕೆ: %s MODULE-NAME [ಮಾಡ್ಯೂಲ್-ಆಯ್ಕೆಗಳು] [--help]" +msgstr "ಬಳಕೆ: %s MODULE-NAME [MODULE-OPTIONS] [--help]" # translation auto-copied from project subscription-manager, version 1.9.X, document keys, author shanky #: ../src/subscription_manager/cli.py:105 @@ -4434,7 +4434,7 @@ msgid "" "subscriptions to this system after completing firstboot." msgstr "" "ಪ್ರಥಮಬೂಟ್‌ ಅನ್ನು ಪೂರ್ಣಗೊಳಿಸಿದ ನಂತರ ನೀವು ಈ ವ್ಯವಸ್ಥೆಗೆ ಚಂದಾದಾರಿಕೆಗಳನ್ನು ಕೈಯಾರೆ " -"ಲಗತ್ತಿಸಲು Red Hat Subscription Manager ಅನ್ನು ಬಳಸಬೇಕಾಗುತ್ತದೆ." +"ಲಗತ್ತಿಸಲು Red Hat ಚಂದಾದಾರಿಕೆ ವ್ಯವಸ್ಥಾಪಕವನ್ನು ಬಳಸಬೇಕಾಗುತ್ತದೆ." # translation auto-copied from project subscription-manager, version 1.9.X, document keys, author shanky #: ../src/subscription_manager/gui/data/manually_subscribe.glade.h:2 diff --git a/po/ko.po b/po/ko.po index bbcaaaa..f8b1223 100644 --- a/po/ko.po +++ b/po/ko.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-02-04 08:45-0500\n" -"PO-Revision-Date: 2014-02-04 08:13-0500\n" +"PO-Revision-Date: 2014-03-03 06:40-0500\n" "Last-Translator: eukim \n" "Language-Team: Korean\n" "Language: ko\n" diff --git a/po/ml.po b/po/ml.po index b88bfbe..e8596e3 100644 --- a/po/ml.po +++ b/po/ml.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-02-04 08:45-0500\n" -"PO-Revision-Date: 2014-02-20 10:47-0500\n" -"Last-Translator: John Sefler \n" +"PO-Revision-Date: 2014-02-28 03:15-0500\n" +"Last-Translator: anipeter \n" "Language-Team: Malayalam\n" "Language: ml\n" "MIME-Version: 1.0\n" diff --git a/po/mr.po b/po/mr.po index c0cd4f8..ffb3948 100644 --- a/po/mr.po +++ b/po/mr.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-02-04 08:45-0500\n" -"PO-Revision-Date: 2014-02-05 04:59-0500\n" +"PO-Revision-Date: 2014-03-03 03:30-0500\n" "Last-Translator: Sandeep Shedmake \n" "Language-Team: Marathi \n" "Language: mr\n" @@ -4351,7 +4351,7 @@ msgid "" "You will need to use Red Hat Subscription Manager to manually attach " "subscriptions to this system after completing firstboot." msgstr "" -"फर्स्टबूट पूर्ण झाल्यानंतर ह्या प्रणालीकरिता सबस्क्रिप्शन्स् स्वतः जोडण्याकरिता Red Hat " +"फर्स्टबूट पूर्ण झाल्यानंतर ह्या प्रणालीकरिता सबस्क्रिप्शन्स स्वतः जोडण्याकरिता Red Hat " "सबस्क्रिप्शन मॅनेजरचा वापर करणे आवश्यक आहे." # translation auto-copied from project subscription-manager, version 1.9.X, document keys diff --git a/po/or.po b/po/or.po index cde4d49..daaae26 100644 --- a/po/or.po +++ b/po/or.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-02-04 08:45-0500\n" -"PO-Revision-Date: 2014-02-06 08:15-0500\n" +"PO-Revision-Date: 2014-02-28 03:33-0500\n" "Last-Translator: mgiri \n" "Language-Team: Oriya \n" "Language: or\n" @@ -202,7 +202,7 @@ msgstr "%%prog %s [ବିକଳ୍ପଗୁଡିକ]" #: ../src/subscription_manager/cli.py:93 #, python-format msgid "Usage: %s MODULE-NAME [MODULE-OPTIONS] [--help]" -msgstr "ବ୍ୟବହାର ବିଧି: %s MODULE-NAME [MODULE-OPTIONS] [--help]" +msgstr "ବ୍ୟବହାର ବିଧ: %s MODULE-NAME [MODULE-OPTIONS] [--help]" # translation auto-copied from project subscription-manager, version 1.9.X, document keys, author mgiri #: ../src/subscription_manager/cli.py:105 diff --git a/po/pa.po b/po/pa.po index 11d50e9..7348666 100644 --- a/po/pa.po +++ b/po/pa.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-02-04 08:45-0500\n" -"PO-Revision-Date: 2014-02-14 01:36-0500\n" +"PO-Revision-Date: 2014-02-28 03:14-0500\n" "Last-Translator: asaini \n" "Language-Team: Punjabi\n" "Language: pa\n" @@ -4325,7 +4325,7 @@ msgid "" "subscriptions to this system after completing firstboot." msgstr "" "ਤੁਹਾਨੂੰ ਇਸ ਸਿਸਟਮ ਨਾਲ ਦਸਤੀ ਮੈਂਬਰੀ ਜੋੜਨ ਲਈ ਫਸਟਬੂਟ ਮੁਕੰਮਲ ਹੋਣ ਤੋਂ ਬਾਅਦ Red Hat ਮੈਂਬਰੀ ਪ੍ਰਬੰਧਕ " -"ਵਰਤਣ ਦੀ ਲੋੜ ਹੈ।" +"ਵਰਤਣ ਦੀ ਲੋੜ ਪਵੇਗੀ।" # translation auto-copied from project subscription-manager, version 1.9.X, document keys #: ../src/subscription_manager/gui/data/manually_subscribe.glade.h:2 diff --git a/po/pt_BR.po b/po/pt_BR.po index 2c6f777..f7d8c54 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-02-04 08:45-0500\n" -"PO-Revision-Date: 2014-02-20 11:26-0500\n" +"PO-Revision-Date: 2014-02-27 03:47-0500\n" "Last-Translator: John Sefler \n" "Language-Team: Portuguese (Brazil)\n" "Language: pt-BR\n" @@ -4651,7 +4651,7 @@ msgid "" "the following to register:" msgstr "" "Este assistente vai lhe ajudar no processo de registro do seu sistema com a " -"Red hat para receber as atualizações de software e outros benefícios. Você " +"Red Hat para receber as atualizações de software e outros benefícios. Você " "irá precisar do seguinte para se registrar:" #: ../src/subscription_manager/gui/data/registration_info.glade.h:2 @@ -4672,7 +4672,7 @@ msgstr "• O endereço de um serviço de gerenciamento de subscrição (opciona #: ../src/subscription_manager/gui/data/registration_info.glade.h:6 msgid "_Why Should I Register?" -msgstr "Por que devo me Registrar?" +msgstr "_Por que devo me Registrar?" #: ../src/subscription_manager/gui/data/registration_info.glade.h:7 msgid "Why Should I Register?" diff --git a/po/ru.po b/po/ru.po index 72543c7..906496b 100644 --- a/po/ru.po +++ b/po/ru.po @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-02-04 08:45-0500\n" -"PO-Revision-Date: 2014-02-06 05:45-0500\n" -"Last-Translator: John Sefler \n" +"PO-Revision-Date: 2014-02-27 10:06-0500\n" +"Last-Translator: ypoyarko \n" "Language-Team: Russian\n" "Language: ru\n" "MIME-Version: 1.0\n" @@ -1932,7 +1932,8 @@ msgid "" "Management. Exiting." msgstr "" "\n" -"Cистема уже зарегистрирована в RHSM. Выход..." +"Cистема уже зарегистрирована при помощи схемы управления подписками Red Hat. " +"Выход..." # translation auto-copied from project subscription-manager, version 1.9.X, document keys, author ypoyarko #: ../src/subscription_manager/migrate/migrate.py:274 @@ -2115,7 +2116,7 @@ msgid "" "System '%s' successfully registered to Red Hat Subscription Management.\n" msgstr "" "Система «%s» успешно зарегистрирована с помощью механизма управления " -"подписками Red Hat. \n" +"подписками Red Hat.\n" # translation auto-copied from project subscription-manager, version 1.9.X, document keys, author ypoyarko #. Display an actual message for the empty string level. @@ -4384,8 +4385,8 @@ msgid "" "After opening Red Hat Subscription Manager, manually attach subscriptions " "via the All Available Subscriptions tab." msgstr "" -"Выделить подписки вручную можно в программе управления подписками, на " -"вкладке Доступные подписки." +"В окне управления подписками Red Hat выберите подписки на вкладке " +"Доступные подписки." #: ../src/subscription_manager/gui/data/repositories.glade.h:1 msgid "Manage Repositories" diff --git a/po/ta_IN.po b/po/ta_IN.po index 2db7235..cc47238 100644 --- a/po/ta_IN.po +++ b/po/ta_IN.po @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-02-04 08:45-0500\n" -"PO-Revision-Date: 2014-02-05 10:41-0500\n" -"Last-Translator: John Sefler \n" +"PO-Revision-Date: 2014-03-03 04:53-0500\n" +"Last-Translator: Shantha kumar \n" "Language-Team: American English \n" "Language: ta-IN\n" "MIME-Version: 1.0\n" diff --git a/po/te.po b/po/te.po index 0ce0b8b..6cb979f 100644 --- a/po/te.po +++ b/po/te.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-02-04 08:45-0500\n" -"PO-Revision-Date: 2014-02-06 05:31-0500\n" -"Last-Translator: John Sefler \n" +"PO-Revision-Date: 2014-03-02 05:18-0500\n" +"Last-Translator: kkrothap \n" "Language-Team: American English \n" "Language: te\n" "MIME-Version: 1.0\n" diff --git a/po/zh_CN.po b/po/zh_CN.po index 7675349..e816d16 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-02-04 08:45-0500\n" -"PO-Revision-Date: 2014-02-26 08:40-0500\n" -"Last-Translator: John Sefler \n" +"PO-Revision-Date: 2014-02-27 08:42-0500\n" +"Last-Translator: leahliu \n" "Language-Team: Chinese (Simplified Han, China)\n" "Language: zh-Hans-CN\n" "MIME-Version: 1.0\n" @@ -204,7 +204,7 @@ msgstr "%%prog %s [选项]" #: ../src/subscription_manager/cli.py:93 #, python-format msgid "Usage: %s MODULE-NAME [MODULE-OPTIONS] [--help]" -msgstr "用法: %s MODULE-NAME [MODULE-选项] [--help]" +msgstr "使用: %s 模块名称 [模块选项] [--help]" # translation auto-copied from project subscription-manager, version 1.9.X, document keys #: ../src/subscription_manager/cli.py:105 @@ -2035,7 +2035,6 @@ msgstr "尝试在红帽订阅管理（Red Hat Subscription Management）中注 # translation auto-copied from project subscription-manager, version 1.9.X, document keys #: ../src/subscription_manager/migrate/migrate.py:635 -#, fuzzy msgid "" "\n" "Unable to register.\n" @@ -2043,7 +2042,7 @@ msgid "" msgstr "" "\n" "无法注册。\n" -"如需进一步的帮助，请联络红帽全球支持服务。" +"如需进一步的帮助，请联络红帽全球支持服务（Red Hat Global Support Services）。" # translation auto-copied from project subscription-manager, version 1.9.X, document keys #: ../src/subscription_manager/migrate/migrate.py:638 @@ -2242,11 +2241,12 @@ msgstr "已经使用 RHN 传统订阅在 Red Hat 注册这个系统。" # translation auto-copied from project subscription-manager, version 1.9.X, document keys, author leahliu #: ../src/subscription_manager/branding/redhat_branding.py:15 -#, fuzzy msgid "" "Your system is being registered again using Red Hat Subscription Management. " "Red Hat recommends that customers only register once." -msgstr "您正在使用红帽订阅管理再次注册您的系统。红帽建议客户只注册一次。" +msgstr "" +"您正在使用红帽订阅管理（Red Hat Subscription Management）再次注册您的系统。" +"Red Hat 建议客户只注册一次。" # translation auto-copied from project subscription-manager, version 1.9.X, document keys #: ../src/subscription_manager/branding/redhat_branding.py:17 @@ -4279,8 +4279,8 @@ msgid "" "You will need to use Red Hat Subscription Manager to manually attach " "subscriptions to this system after completing firstboot." msgstr "" -"完成首次引导后，您需要使用 Red Hat Subscription Manager 手动在这个系统中附加" -"订阅。" +"完成 firstboot 后，您需要使用 Red Hat Subscription Manager 手动在这个系统中添" +"加订阅。" # translation auto-copied from project subscription-manager, version 1.9.X, document keys #: ../src/subscription_manager/gui/data/manually_subscribe.glade.h:2 diff --git a/po/zh_TW.po b/po/zh_TW.po index 6c50d98..d01096b 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-02-04 08:45-0500\n" -"PO-Revision-Date: 2014-02-23 11:48-0500\n" +"PO-Revision-Date: 2014-03-02 07:08-0500\n" "Last-Translator: tchuang \n" "Language-Team: Chinese (Traditional Han, Taiwan)\n" "Language: zh-Hant-TW\n" diff --git a/rel-eng/packages/subscription-manager b/rel-eng/packages/subscription-manager index cab0aeb..6df7ff7 100644 --- a/rel-eng/packages/subscription-manager +++ b/rel-eng/packages/subscription-manager @@ -1 +1 @@ -1.10.14-3 ./ +1.10.14-4 ./ diff --git a/rel-eng/tito.props b/rel-eng/tito.props index 17792b0..6f078a5 100644 --- a/rel-eng/tito.props +++ b/rel-eng/tito.props @@ -1,4 +1,5 @@ [globalconfig] -default_builder = tito.builder.UpstreamBuilder +#default_builder = tito.builder.UpstreamBuilder +default_builder = tito.distributionbuilder.DistributionBuilder default_tagger = tito.tagger.ReleaseTagger diff --git a/src/rhsm_debug/debug_commands.py b/src/rhsm_debug/debug_commands.py index f7b85c3..d1b2bbe 100644 --- a/src/rhsm_debug/debug_commands.py +++ b/src/rhsm_debug/debug_commands.py @@ -132,8 +132,8 @@ class SystemCommand(CliCommand): # (as is the default) we will have already copied there contents, # so ignore directory exists errors try: - if defaults['ca_cert_dir'] != cfg.get('server', 'ca_cert_dir') or not sos: - self._copy_cert_directory(cfg.get('server', 'ca_cert_dir'), content_path) + if defaults['ca_cert_dir'] != cfg.get('rhsm', 'ca_cert_dir') or not sos: + self._copy_cert_directory(cfg.get('rhsm', 'ca_cert_dir'), content_path) except EnvironmentError, e: if e.errno != errno.EEXIST: raise diff --git a/subscription-manager.spec b/subscription-manager.spec index 68de3c2..db8a262 100644 --- a/subscription-manager.spec +++ b/subscription-manager.spec @@ -1,22 +1,20 @@ # Prefer systemd over sysv on Fedora 17+ and RHEL 7+ -%define use_systemd (0%{?fedora} && 0%{?fedora} >= 17) || (0%{?rhel} && 0%{?rhel} >= 7) -%define use_dateutil (0%{?fedora} && 0%{?fedora} >= 17) || (0%{?rhel} && 0%{?rhel} >= 6) -%define use_old_firstboot (0%{?rhel} && 0%{?rhel} <= 6) - - -%define rhsm_plugins_dir /usr/share/rhsm-plugins +%global use_systemd (0%{?fedora} && 0%{?fedora} >= 17) || (0%{?rhel} && 0%{?rhel} >= 7) +%global use_dateutil (0%{?fedora} && 0%{?fedora} >= 17) || (0%{?rhel} && 0%{?rhel} >= 6) +%global use_old_firstboot (0%{?rhel} && 0%{?rhel} <= 6) +%global rhsm_plugins_dir /usr/share/rhsm-plugins %global _hardened_build 1 # A couple files are for RHEL 5 only: %if 0%{?rhel} == 5 -%define el5 1 +%global el5 1 %endif Name: subscription-manager Version: 1.10.14 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Tools and libraries for subscription and repository management Group: System Environment/Base License: GPLv2 @@ -49,20 +47,19 @@ Requires: python-dateutil Requires: PyXML %endif - # There's no dmi to read on these arches, so don't pull in this dep. %ifnarch ppc ppc64 s390 s390x Requires: python-dmidecode %endif +%if %use_systemd +Requires(post): systemd +Requires(preun): systemd +Requires(postun): systemd +%else Requires(post): chkconfig Requires(preun): chkconfig Requires(preun): initscripts - -%if %use_systemd -Requires(post): systemd-units -Requires(preun): systemd-units -Requires(postun): systemd-units %endif BuildRequires: python-devel @@ -74,6 +71,10 @@ BuildRequires: desktop-file-utils BuildRequires: redhat-lsb BuildRequires: scrollkeeper BuildRequires: GConf2-devel +%if %use_systemd +# We need the systemd RPM macros +BuildRequires: systemd +%endif %description @@ -286,7 +287,7 @@ rm -rf %{buildroot} %if %use_systemd %attr(644,root,root) %{_unitdir}/rhsmcertd.service - %attr(644,root,root) %{_prefix}/lib/tmpfiles.d/%{name}.conf + %attr(644,root,root) %{_tmpfilesdir}/%{name}.conf %else %attr(755,root,root) %{_initrddir}/rhsmcertd %endif @@ -401,8 +402,7 @@ fi %preun if [ $1 -eq 0 ] ; then %if %use_systemd - /bin/systemctl --no-reload disable rhsmcertd.service > /dev/null 2>&1 || : - /bin/systemctl stop rhsmcertd.service > /dev/null 2>&1 || : + %systemd_preun rhsmcertd.service %else /sbin/service rhsmcertd stop >/dev/null 2>&1 /sbin/chkconfig --del rhsmcertd @@ -415,13 +415,15 @@ fi %postun %if %use_systemd - /bin/systemctl daemon-reload >/dev/null 2>&1 || : - if [ $1 -eq 1 ] ; then - /bin/systemctl try-restart rhsmcertd.service >/dev/null 2>&1 || : - fi + %systemd_postun_with_restart rhsmcertd.service %endif %changelog +* Tue Mar 04 2014 ckozak 1.10.14-4 +- 1030378: Latest strings from zanata. (alikins@redhat.com) +- 1070737: correct config section for ca_cert_dir (ckozak@redhat.com) +- Use systemd RPM macros to make life easier. (awood@redhat.com) + * Wed Feb 26 2014 ckozak 1.10.14-3 - 906567: Fix translations of "Red Hat" (alikins@redhat.com) - 1039914: rhsm-debug updates and fixes (alikins@redhat.com)