spacewalk-commits February 2014

spacewalk-commits@lists.fedorahosted.org

10 participants
275 discussions

Changes to 'refs/tags/spacewalk-branding-2.1.29-1'
by Michael Mraka 14 Feb '14

14 Feb '14

Tag 'spacewalk-branding-2.1.29-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2014-02-14 16:02 +0000 Tagging package [spacewalk-branding] version [2.1.29-1] in directory [branding/]. Changes since bootstrap-datepicker-1.3.0-2: Michael Mraka (1): Automatic commit of package [spacewalk-branding] release [2.1.29-1]. --- branding/spacewalk-branding.spec | 5 ++++- rel-eng/packages/spacewalk-branding | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) ---

1 0

branding/spacewalk-branding.spec rel-eng/packages
by Michael Mraka 14 Feb '14

14 Feb '14

branding/spacewalk-branding.spec | 5 ++++- rel-eng/packages/spacewalk-branding | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit db7036773b4c977115650f85df1afeb7fe7539d3 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Fri Feb 14 17:02:18 2014 +0100 Automatic commit of package [spacewalk-branding] release [2.1.29-1]. diff --git a/branding/spacewalk-branding.spec b/branding/spacewalk-branding.spec index 966289b..71b5d38 100644 --- a/branding/spacewalk-branding.spec +++ b/branding/spacewalk-branding.spec @@ -9,7 +9,7 @@ %endif Name: spacewalk-branding -Version: 2.1.28 +Version: 2.1.29 Release: 1%{?dist} Summary: Spacewalk branding data @@ -89,6 +89,9 @@ rm -rf %{buildroot} %doc LICENSE %changelog +* Fri Feb 14 2014 Michael Mraka <michael.mraka(a)redhat.com> 2.1.29-1 +- datepicker needs bootstrap-datepicker and jquery-timepicker + * Fri Feb 14 2014 Michael Mraka <michael.mraka(a)redhat.com> 2.1.28-1 - simplify datepicker layout and unify look of date/time part - Introduce a date-time picker. diff --git a/rel-eng/packages/spacewalk-branding b/rel-eng/packages/spacewalk-branding index de5879b..55a849c 100644 --- a/rel-eng/packages/spacewalk-branding +++ b/rel-eng/packages/spacewalk-branding @@ -1 +1 @@ -2.1.28-1 branding/ +2.1.29-1 branding/

1 0

Changes to 'refs/tags/bootstrap-datepicker-1.3.0-2'
by Michael Mraka 14 Feb '14

14 Feb '14

Tag 'bootstrap-datepicker-1.3.0-2' created by Michael Mraka <michael.mraka(a)redhat.com> at 2014-02-14 16:02 +0000 Tagging package [bootstrap-datepicker] version [1.3.0-2] in directory [spec-tree/bootstrap-datepicker/]. Changes since jquery-timepicker-1.3.3-1: Michael Mraka (5): add bootstrap-datepicker and jquery-timepicker to yum repos datepicker needs bootstrap-datepicker and jquery-timepicker fixed indentation added missing directory Automatic commit of package [bootstrap-datepicker] minor release [1.3.0-2]. --- branding/spacewalk-branding.spec | 12 +++++++----- rel-eng/comps/comps-spacewalk-server-fedora18.xml | 2 ++ rel-eng/comps/comps-spacewalk-server-fedora19.xml | 2 ++ rel-eng/comps/comps-spacewalk-server-fedora20.xml | 2 ++ rel-eng/comps/comps-spacewalk-server-rhel5.xml | 2 ++ rel-eng/comps/comps-spacewalk-server-rhel6.xml | 2 ++ rel-eng/packages/bootstrap-datepicker | 2 +- spec-tree/bootstrap-datepicker/bootstrap-datepicker.spec | 6 +++++- 8 files changed, 23 insertions(+), 7 deletions(-) ---

1 0

4 commits - branding/spacewalk-branding.spec rel-eng/packages spec-tree/bootstrap-datepicker
by Michael Mraka 14 Feb '14

14 Feb '14

branding/spacewalk-branding.spec | 12 +++++++----- rel-eng/packages/bootstrap-datepicker | 2 +- spec-tree/bootstrap-datepicker/bootstrap-datepicker.spec | 6 +++++- 3 files changed, 13 insertions(+), 7 deletions(-) New commits: commit 3b59d7883e1e6988c2690f2d87313c6b0a3abdd4 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Fri Feb 14 17:02:06 2014 +0100 Automatic commit of package [bootstrap-datepicker] minor release [1.3.0-2]. diff --git a/rel-eng/packages/bootstrap-datepicker b/rel-eng/packages/bootstrap-datepicker index c620ef0..aeae907 100644 --- a/rel-eng/packages/bootstrap-datepicker +++ b/rel-eng/packages/bootstrap-datepicker @@ -1 +1 @@ -1.3.0-1 spec-tree/bootstrap-datepicker/ +1.3.0-2 spec-tree/bootstrap-datepicker/ diff --git a/spec-tree/bootstrap-datepicker/bootstrap-datepicker.spec b/spec-tree/bootstrap-datepicker/bootstrap-datepicker.spec index 9f7b1e0..672c1a0 100644 --- a/spec-tree/bootstrap-datepicker/bootstrap-datepicker.spec +++ b/spec-tree/bootstrap-datepicker/bootstrap-datepicker.spec @@ -1,6 +1,6 @@ Name: bootstrap-datepicker Version: 1.3.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Bootstrap-datepicker provides a flexible datepicker widget in the Twitter bootstrap style. Group: Applications/Internet @@ -39,6 +39,9 @@ rm -rf %{buildroot} %changelog +* Fri Feb 14 2014 Michael Mraka <michael.mraka(a)redhat.com> 1.3.0-2 +- added missing directory + * Fri Feb 14 2014 Michael Mraka <michael.mraka(a)redhat.com> 1.3.0-1 - initial build of bootstrap-datepicker commit d20edf513c88ac9b579bb03b62e681d352ed00c3 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Fri Feb 14 17:01:25 2014 +0100 added missing directory diff --git a/spec-tree/bootstrap-datepicker/bootstrap-datepicker.spec b/spec-tree/bootstrap-datepicker/bootstrap-datepicker.spec index d4b4a95..9f7b1e0 100644 --- a/spec-tree/bootstrap-datepicker/bootstrap-datepicker.spec +++ b/spec-tree/bootstrap-datepicker/bootstrap-datepicker.spec @@ -22,6 +22,7 @@ style. %install rm -rf %{buildroot} +install -d -m 755 %{buildroot}%{_var}/www/html/css install -d -m 755 %{buildroot}%{_var}/www/html/javascript install -m 644 js/bootstrap-datepicker.js %{buildroot}%{_var}/www/html/javascript/ install -m 644 css/datepicker3.css %{buildroot}%{_var}/www/html/css/bootstrap-datepicker.css commit 172e62b5f5169fca0340d0ac87a4cfc1248ad020 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Fri Feb 14 16:46:48 2014 +0100 fixed indentation diff --git a/branding/spacewalk-branding.spec b/branding/spacewalk-branding.spec index a73d9c7..966289b 100644 --- a/branding/spacewalk-branding.spec +++ b/branding/spacewalk-branding.spec @@ -23,13 +23,13 @@ BuildArch: noarch BuildRequires: java-devel >= 1.5.0 BuildRequires: nodejs-less BuildRequires: bootstrap-less <= 3.0.0 -Requires: httpd -Requires: bootstrap <= 3.0.0 -Requires: bootstrap-datepicker -Requires: font-awesome >= 4.0.0 -Requires: jquery-timepicker <= 1.3.2 -Requires: roboto >= 1.2 -Requires: pwstrength-bootstrap +Requires: httpd +Requires: bootstrap <= 3.0.0 +Requires: bootstrap-datepicker +Requires: font-awesome >= 4.0.0 +Requires: jquery-timepicker <= 1.3.2 +Requires: roboto >= 1.2 +Requires: pwstrength-bootstrap %description Spacewalk specific branding, CSS, and images. commit f42de562490c3773d79a02337ba434cc3fe6225e Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Fri Feb 14 16:45:17 2014 +0100 datepicker needs bootstrap-datepicker and jquery-timepicker diff --git a/branding/spacewalk-branding.spec b/branding/spacewalk-branding.spec index e8e8202..a73d9c7 100644 --- a/branding/spacewalk-branding.spec +++ b/branding/spacewalk-branding.spec @@ -25,7 +25,9 @@ BuildRequires: nodejs-less BuildRequires: bootstrap-less <= 3.0.0 Requires: httpd Requires: bootstrap <= 3.0.0 +Requires: bootstrap-datepicker Requires: font-awesome >= 4.0.0 +Requires: jquery-timepicker <= 1.3.2 Requires: roboto >= 1.2 Requires: pwstrength-bootstrap

1 0

rel-eng/comps
by Michael Mraka 14 Feb '14

14 Feb '14

rel-eng/comps/comps-spacewalk-server-fedora18.xml | 2 ++ rel-eng/comps/comps-spacewalk-server-fedora19.xml | 2 ++ rel-eng/comps/comps-spacewalk-server-fedora20.xml | 2 ++ rel-eng/comps/comps-spacewalk-server-rhel5.xml | 2 ++ rel-eng/comps/comps-spacewalk-server-rhel6.xml | 2 ++ 5 files changed, 10 insertions(+) New commits: commit 47fc382362579cc0bdab05e313d0c14e9a4a01f7 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Fri Feb 14 16:41:52 2014 +0100 add bootstrap-datepicker and jquery-timepicker to yum repos diff --git a/rel-eng/comps/comps-spacewalk-server-fedora18.xml b/rel-eng/comps/comps-spacewalk-server-fedora18.xml index 1579c14..cb54127 100644 --- a/rel-eng/comps/comps-spacewalk-server-fedora18.xml +++ b/rel-eng/comps/comps-spacewalk-server-fedora18.xml @@ -20,6 +20,7 @@ <packagereq type="default">yum-rhn-plugin</packagereq> <packagereq type="default">bootstrap</packagereq> + <packagereq type="default">bootstrap-datepicker</packagereq> <packagereq type="optional">bootstrap-less</packagereq> <packagereq type="default">cobbler2</packagereq> <packagereq type="default">cobbler20</packagereq> @@ -32,6 +33,7 @@ <packagereq type="optional">font-awesome-devel</packagereq> <packagereq type="optional">heirloom-pkgtools</packagereq> <packagereq type="default">jpam</packagereq> + <packagereq type="default">jquery-timepicker</packagereq> <packagereq type="default">MessageQueue</packagereq> <packagereq type="default">nocpulse-common</packagereq> <packagereq type="default">nocpulse-db-perl</packagereq> diff --git a/rel-eng/comps/comps-spacewalk-server-fedora19.xml b/rel-eng/comps/comps-spacewalk-server-fedora19.xml index 1be8f3a..e2b5e05 100644 --- a/rel-eng/comps/comps-spacewalk-server-fedora19.xml +++ b/rel-eng/comps/comps-spacewalk-server-fedora19.xml @@ -20,6 +20,7 @@ <packagereq type="default">yum-rhn-plugin</packagereq> <packagereq type="default">bootstrap</packagereq> + <packagereq type="default">bootstrap-datepicker</packagereq> <packagereq type="optional">bootstrap-less</packagereq> <packagereq type="default">cobbler2</packagereq> <packagereq type="default">cobbler20</packagereq> @@ -32,6 +33,7 @@ <packagereq type="optional">font-awesome-devel</packagereq> <packagereq type="optional">heirloom-pkgtools</packagereq> <packagereq type="default">jpam</packagereq> + <packagereq type="default">jquery-timepicker</packagereq> <packagereq type="default">MessageQueue</packagereq> <packagereq type="default">nocpulse-common</packagereq> <packagereq type="default">nocpulse-db-perl</packagereq> diff --git a/rel-eng/comps/comps-spacewalk-server-fedora20.xml b/rel-eng/comps/comps-spacewalk-server-fedora20.xml index 1be8f3a..e2b5e05 100644 --- a/rel-eng/comps/comps-spacewalk-server-fedora20.xml +++ b/rel-eng/comps/comps-spacewalk-server-fedora20.xml @@ -20,6 +20,7 @@ <packagereq type="default">yum-rhn-plugin</packagereq> <packagereq type="default">bootstrap</packagereq> + <packagereq type="default">bootstrap-datepicker</packagereq> <packagereq type="optional">bootstrap-less</packagereq> <packagereq type="default">cobbler2</packagereq> <packagereq type="default">cobbler20</packagereq> @@ -32,6 +33,7 @@ <packagereq type="optional">font-awesome-devel</packagereq> <packagereq type="optional">heirloom-pkgtools</packagereq> <packagereq type="default">jpam</packagereq> + <packagereq type="default">jquery-timepicker</packagereq> <packagereq type="default">MessageQueue</packagereq> <packagereq type="default">nocpulse-common</packagereq> <packagereq type="default">nocpulse-db-perl</packagereq> diff --git a/rel-eng/comps/comps-spacewalk-server-rhel5.xml b/rel-eng/comps/comps-spacewalk-server-rhel5.xml index 90f25ea..fdfcbf5 100644 --- a/rel-eng/comps/comps-spacewalk-server-rhel5.xml +++ b/rel-eng/comps/comps-spacewalk-server-rhel5.xml @@ -23,6 +23,7 @@ <packagereq type="default">bea-stax</packagereq> <packagereq type="default">bea-stax-api</packagereq> <packagereq type="default">bootstrap</packagereq> + <packagereq type="default">bootstrap-datepicker</packagereq> <packagereq type="optional">bootstrap-less</packagereq> <packagereq type="default">c3p0</packagereq> <packagereq type="default">cglib</packagereq> @@ -57,6 +58,7 @@ <packagereq type="default">jaxen-manual</packagereq> <packagereq type="default">jaxen-repolib</packagereq> <packagereq type="default">jpam</packagereq> + <packagereq type="default">jquery-timepicker</packagereq> <packagereq type="default">MessageQueue</packagereq> <packagereq type="default">msv</packagereq> <packagereq type="default">msv-demo</packagereq> diff --git a/rel-eng/comps/comps-spacewalk-server-rhel6.xml b/rel-eng/comps/comps-spacewalk-server-rhel6.xml index caef27f..9e8607a 100644 --- a/rel-eng/comps/comps-spacewalk-server-rhel6.xml +++ b/rel-eng/comps/comps-spacewalk-server-rhel6.xml @@ -20,6 +20,7 @@ <packagereq type="default">yum-rhn-plugin</packagereq> <packagereq type="default">bootstrap</packagereq> + <packagereq type="default">bootstrap-datepicker</packagereq> <packagereq type="optional">bootstrap-less</packagereq> <packagereq type="default">cobbler2</packagereq> <packagereq type="default">cobbler20</packagereq> @@ -32,6 +33,7 @@ <packagereq type="optional">font-awesome-devel</packagereq> <packagereq type="optional">heirloom-pkgtools</packagereq> <packagereq type="default">jpam</packagereq> + <packagereq type="default">jquery-timepicker</packagereq> <packagereq type="default">MessageQueue</packagereq> <packagereq type="default">nocpulse-common</packagereq> <packagereq type="default">nocpulse-db-perl</packagereq>

1 0

Changes to 'refs/tags/jquery-timepicker-1.3.3-1'
by Michael Mraka 14 Feb '14

14 Feb '14

Tag 'jquery-timepicker-1.3.3-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2014-02-14 15:37 +0000 Tagging package [jquery-timepicker] version [1.3.3-1] in directory [spec-tree/jquery-timepicker/]. Changes since rhn-client-tools-2.1.16-1: Michael Mraka (2): jquery-timepicker packaging Automatic commit of package [jquery-timepicker] minor release [1.3.3-1]. --- rel-eng/packages/jquery-timepicker | 1 spec-tree/jquery-timepicker/jquery-timepicker.spec | 43 +++++++++++++++++++++ spec-tree/jquery-timepicker/tito.props | 3 + 3 files changed, 47 insertions(+) ---

1 0

2 commits - rel-eng/packages spec-tree/jquery-timepicker
by Michael Mraka 14 Feb '14

14 Feb '14

rel-eng/packages/jquery-timepicker | 1 spec-tree/jquery-timepicker/jquery-timepicker.spec | 43 +++++++++++++++++++++ spec-tree/jquery-timepicker/tito.props | 3 + 3 files changed, 47 insertions(+) New commits: commit 61b77af6e47b19f11ec2ddc9a9453025a42d5fab Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Fri Feb 14 16:37:46 2014 +0100 Automatic commit of package [jquery-timepicker] minor release [1.3.3-1]. diff --git a/rel-eng/packages/jquery-timepicker b/rel-eng/packages/jquery-timepicker new file mode 100644 index 0000000..86c4166 --- /dev/null +++ b/rel-eng/packages/jquery-timepicker @@ -0,0 +1 @@ +1.3.3-1 spec-tree/jquery-timepicker/ diff --git a/spec-tree/jquery-timepicker/jquery-timepicker.spec b/spec-tree/jquery-timepicker/jquery-timepicker.spec index bb29318..41fd940 100644 --- a/spec-tree/jquery-timepicker/jquery-timepicker.spec +++ b/spec-tree/jquery-timepicker/jquery-timepicker.spec @@ -1,6 +1,6 @@ Name: jquery-timepicker Version: 1.3.3 -Release: 0%{?dist} +Release: 1%{?dist} Summary: A lightweight, customizable jQuery timepicker plugin inspired by Google Calendar. Group: Applications/Internet @@ -38,3 +38,6 @@ rm -rf %{buildroot} %changelog +* Fri Feb 14 2014 Michael Mraka <michael.mraka(a)redhat.com> 1.3.3-1 +- initial build of jquery-timepicker + commit 039f30eac4d07314c49a3db1d9603e8cda14f59a Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Fri Feb 14 16:36:17 2014 +0100 jquery-timepicker packaging diff --git a/spec-tree/jquery-timepicker/jquery-timepicker.spec b/spec-tree/jquery-timepicker/jquery-timepicker.spec new file mode 100644 index 0000000..bb29318 --- /dev/null +++ b/spec-tree/jquery-timepicker/jquery-timepicker.spec @@ -0,0 +1,40 @@ +Name: jquery-timepicker +Version: 1.3.3 +Release: 0%{?dist} +Summary: A lightweight, customizable jQuery timepicker plugin inspired by Google Calendar. + +Group: Applications/Internet +License: Apache Software License v2 +URL: http://jonthornton.github.io/jquery-timepicker/ +Source0: https://github.com/jonthornton/jquery-timepicker/archive/%{version}.tar.gz#… +BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) +BuildArch: noarch + +%description +A lightweight, customizable jQuery timepicker plugin inspired by Google Calendar. + + +%prep +%setup -q + +%build + +%install +rm -rf %{buildroot} +install -d -m 755 %{buildroot}%{_var}/www/html/css +install -d -m 755 %{buildroot}%{_var}/www/html/javascript +install -m 644 jquery.timepicker.css %{buildroot}%{_var}/www/html/css/ +install -m 644 jquery.timepicker.js %{buildroot}%{_var}/www/html/javascript/ + +%clean +rm -rf %{buildroot} + + +%files +%defattr(-,root,root,-) +%{_var}/www/html/css/* +%{_var}/www/html/javascript/* + + + +%changelog diff --git a/spec-tree/jquery-timepicker/tito.props b/spec-tree/jquery-timepicker/tito.props new file mode 100644 index 0000000..8c63ded --- /dev/null +++ b/spec-tree/jquery-timepicker/tito.props @@ -0,0 +1,3 @@ +[buildconfig] +tagger = tito.tagger.ReleaseTagger +builder = spacewalkx.builderx.NoTgzBuilder

1 0

Changes to 'refs/tags/rhn-client-tools-2.1.16-1'
by Milan Zazrivec 14 Feb '14

14 Feb '14

Tag 'rhn-client-tools-2.1.16-1' created by Milan Zazrivec <mzazrivec(a)redhat.com> at 2014-02-14 15:31 +0000 Tagging package [rhn-client-tools] version [2.1.16-1] in directory [client/rhel/rhn-client-tools/]. Changes since bootstrap-datepicker-1.3.0-1: Milan Zazrivec (3): 1061013 - remove macros.up2date from package build 1061013 - remove up2date_config.rpmmacros client action Automatic commit of package [rhn-client-tools] release [2.1.16-1]. --- client/rhel/rhn-client-tools/etc-conf/Makefile | 4 - client/rhel/rhn-client-tools/rhn-client-tools.spec | 6 + client/rhel/rhn-client-tools/src/actions/up2date_config.py | 44 ------------- rel-eng/packages/rhn-client-tools | 2 4 files changed, 6 insertions(+), 50 deletions(-) ---

1 0

3 commits - client/rhel rel-eng/packages
by Milan Zazrivec 14 Feb '14

14 Feb '14

client/rhel/rhn-client-tools/etc-conf/Makefile | 4 - client/rhel/rhn-client-tools/rhn-client-tools.spec | 6 + client/rhel/rhn-client-tools/src/actions/up2date_config.py | 44 ------------- rel-eng/packages/rhn-client-tools | 2 4 files changed, 6 insertions(+), 50 deletions(-) New commits: commit 22b46647fd50dae50418b7d41a3d5833e6c4d588 Author: Milan Zazrivec <mzazrivec(a)redhat.com> Date: Fri Feb 14 16:31:13 2014 +0100 Automatic commit of package [rhn-client-tools] release [2.1.16-1]. diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec b/client/rhel/rhn-client-tools/rhn-client-tools.spec index 5758523..5f0215c 100644 --- a/client/rhel/rhn-client-tools/rhn-client-tools.spec +++ b/client/rhel/rhn-client-tools/rhn-client-tools.spec @@ -4,7 +4,7 @@ Group: System Environment/Base Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz URL: https://fedorahosted.org/spacewalk Name: rhn-client-tools -Version: 2.1.15 +Version: 2.1.16 Release: 1%{?dist} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -360,6 +360,10 @@ make -f Makefile.rhn-client-tools test %endif %changelog +* Fri Feb 14 2014 Milan Zazrivec <mzazrivec(a)redhat.com> 2.1.16-1 +- 1061013 - remove up2date_config.rpmmacros client action +- 1061013 - remove macros.up2date from package build + * Fri Feb 14 2014 Matej Kollar <mkollar(a)redhat.com> 2.1.15-1 - 1061013 - remove unneeded rpm macros file - 1060742 - new information icon in gnome3 diff --git a/rel-eng/packages/rhn-client-tools b/rel-eng/packages/rhn-client-tools index a3d6175..14ef5ce 100644 --- a/rel-eng/packages/rhn-client-tools +++ b/rel-eng/packages/rhn-client-tools @@ -1 +1 @@ -2.1.15-1 client/rhel/rhn-client-tools/ +2.1.16-1 client/rhel/rhn-client-tools/ commit 46225ac557ead3dfac019958020861fe740aea66 Author: Milan Zazrivec <mzazrivec(a)redhat.com> Date: Fri Feb 14 16:23:52 2014 +0100 1061013 - remove up2date_config.rpmmacros client action Support for this client-side action has never been implemented on the server. diff --git a/client/rhel/rhn-client-tools/src/actions/up2date_config.py b/client/rhel/rhn-client-tools/src/actions/up2date_config.py index 0edd125..44f31dd 100644 --- a/client/rhel/rhn-client-tools/src/actions/up2date_config.py +++ b/client/rhel/rhn-client-tools/src/actions/up2date_config.py @@ -16,7 +16,6 @@ cfg = config.initUp2dateConfig() __rhnexport__ = [ 'update', - 'rpmmacros', 'get'] argVerbose = 0 @@ -63,49 +62,6 @@ def get(cache_only=None): return (0, "configuration retrived", {'data' : ret}) -def rpmmacros(macroName, macroValue, cache_only): - if cache_only: - return (0, "no-ops for caching", {}) - writeUp2dateMacro(macroName, macroValue) - return (0, "%s set to %s" % (macroName, macroValue), {}) - - -def writeUp2dateMacro(macroName, macroValue): - - if os.access("/etc/rpm/macros.up2date", os.R_OK): - f = open("/etc/rpm/macros.up2date", "r") - lines = f.readlines() - f.close() - else: - lines = [] - comment_r = re.compile("\s*#.*") - value_r = re.compile("%s.*" % macroName) - blank_r = re.compile("\s*") - newfile = [] - for line in lines: - m = value_r.match(line) - if m: - continue - - m = comment_r.match(line) - if m: - newfile.append(line) - continue - - newfile.append(line) - - # dont care about blank lines... - - newfile.append("\n") - newfile.append("%s %s" % (macroName, macroValue)) - - - f = open("/etc/rpm/macros.up2date", "w") - for line in newfile: - f.write(line) - f.write("\n") - f.close() - def main(): configdatatup = get() commit 2c2b59ebbac688791015bfbf0d1b265365d6a8f5 Author: Milan Zazrivec <mzazrivec(a)redhat.com> Date: Fri Feb 14 16:20:13 2014 +0100 1061013 - remove macros.up2date from package build diff --git a/client/rhel/rhn-client-tools/etc-conf/Makefile b/client/rhel/rhn-client-tools/etc-conf/Makefile index 9054968..c418d2a 100644 --- a/client/rhel/rhn-client-tools/etc-conf/Makefile +++ b/client/rhel/rhn-client-tools/etc-conf/Makefile @@ -4,7 +4,6 @@ PREFIX ?= CONFIG = up2date.config -MACROS_CONFIG = macros.up2date # Directories for installation PAMD_DIR = $(PREFIX)/etc/pam.d @@ -41,9 +40,6 @@ install:: all $(DIRS) [ -f $(CONFIG_DIR)/up2date ] && true || \ $(INSTALL_DATA) $(CONFIG) $(CONFIG_DIR)/up2date - [ -f $(MACROS_DIR)/macros.up2date ] && true || \ - $(INSTALL_DATA) $(MACROS_CONFIG) $(MACROS_DIR)/macros.up2date - $(INSTALL_DATA) up2date.logrotate $(LOGROTATE_DIR)/up2date clean::

1 0

Changes to 'refs/tags/bootstrap-datepicker-1.3.0-1'
by Michael Mraka 14 Feb '14

14 Feb '14

Tag 'bootstrap-datepicker-1.3.0-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2014-02-14 15:02 +0000 Tagging package [bootstrap-datepicker] version [1.3.0-1] in directory [spec-tree/bootstrap-datepicker/]. Changes since spacewalk-web-2.1.57-1: Bo Maryniuk (1): Proper TB3 column class Michael Mraka (2): bootstrap-datepicker packaging Automatic commit of package [bootstrap-datepicker] minor release [1.3.0-1]. Mike Dorman (1): Refeactored cookie parsing code to better handle malformed cookies --- java/code/webapp/WEB-INF/pages/common/fragments/datepicker-with-label.jsp | 4 rel-eng/packages/bootstrap-datepicker | 1 spec-tree/bootstrap-datepicker/bootstrap-datepicker.spec | 43 ++++++++++ spec-tree/bootstrap-datepicker/tito.props | 3 web/modules/pxt/PXT/ApacheHandler.pm | 8 + 5 files changed, 56 insertions(+), 3 deletions(-) ---

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

spacewalk-commits February 2014