Commit graph

15 commits

Author SHA1 Message Date
Thomas Haller
6f0036151f settings: enable "ibft" plugin by default together with "ifcfg-rh"
Originally, ibft settings were handled by "ifcfg-rh" plugin. Later, we added
a separate "ibft" plugin and moved the functionality there.

The problem was that users quite possibly had a configuration like
  [main]
  plugins=ifcfg-rh
in their "NetworkManager.conf". That meant, after upgrade users would
no longer have ibft support.

We fixed that by installing "/etc/NetworkManager/conf.d/10-ibft-plugin.conf"
which was read after the main file and contained:
  [main]
  plugins+=ibft

We no longer want to install configuration snippets with our core packages to
/etc. Avoid the regression by changing the meaning of "ifcfg-rh". By enabling
"ifcfg-rh" you now implicitly enable "ibft" plugin as well. This can be
turned off via "no-ibft". And you can continue to enable "ibft" plugin
alone.
2015-07-02 16:01:20 +02:00
Thomas Haller
8eba28b9bd contrib/rpm: add 10-ibft-plugin.conf config file
Taken from rhel-7.1 package
2015-01-28 13:20:19 +01:00
Dan Williams
471375a3e1 release: remove "nano" version
Now that NM is >= 1.0 there is no need for a "nano" version.
2014-12-12 15:06:39 -06:00
Thomas Haller
b1e26735a0 contrib/rpm: add option to only building SRPM
Set environment variable BUILDTYPE=SRPM or call
`build_clean.sh --srpm`.

Signed-off-by: Thomas Haller <thaller@redhat.com>
2014-11-07 21:31:12 +01:00
Lubomir Rintel
479dd171ae contrib/rpm: Count all predecessors in revision number
The revision number of the RPM (as build by contrib/rpm) should
be increasing so that newer packages can be installed using
`yum install` and older packages can be downgraded using
`yum downgrade`.
By counting only --first-parent, the following example turns
out wrong. Note the duplicate revision numbers.

  -- A(100)----------------------------F(101)----G(102)
      \                               /
       B(101)----C(102)----D(103)----E(104)

Just count *all* parent commits
2014-10-20 12:38:00 +02:00
Thomas Haller
3cfd8b8eec contrib/rpm: add new package NetworkManager-config-connectivity-fedora
Provides config file 20-connectivity-fedora.conf

Signed-off-by: Thomas Haller <thaller@redhat.com>
2014-07-04 12:25:51 +02:00
Thomas Haller
adb3e37c74 contrib/rpm: cleanup of NetworkManager.spec by adding %{epoch_version} and %{git_sha_version}
Signed-off-by: Thomas Haller <thaller@redhat.com>
2014-06-25 22:11:57 +02:00
Thomas Haller
070e19dc31 contrib/build: cleanup build.sh script and improve build_clean.sh
Signed-off-by: Thomas Haller <thaller@redhat.com>
2014-05-31 19:27:42 +02:00
Thomas Haller
7857043195 contrib/build: cleanup build.sh script by adding write_changelog() function
Signed-off-by: Thomas Haller <thaller@redhat.com>
2014-05-31 19:27:42 +02:00
Thomas Haller
dbed9e5378 contrib/build: remove external NMTUI source from build.sh
nmtui is long part of the NM main source. Remove the code from the build.sh
script to add 'nmtui' from an external tarball.

Signed-off-by: Thomas Haller <thaller@redhat.com>
2014-05-31 19:27:38 +02:00
Tore Anderson
c2e99b181f contrib/rpm: force POSIX changelog date locale
Ensure the date in the generated changelog entry is in the POSIX locale
format. Otherwise rpmbuild might fail with "bad date in %changelog" due
to it not liking localised date formats.

https://mail.gnome.org/archives/networkmanager-list/2014-May/msg00034.html

Signed-off-by: Thomas Haller <thaller@redhat.com>
2014-05-19 14:51:48 +02:00
Thomas Haller
b322642a03 contrib/rpm: add script build_clean.sh to create clean RPM files 2014-05-07 18:16:36 +02:00
Thomas Haller
b057d5179e contrib/rpm: build.sh uses the number of git commits as RELEASE_VERSION
Signed-off-by: Thomas Haller <thaller@redhat.com>
2014-05-07 18:16:36 +02:00
Thomas Haller
a9ed313956 contrib/rpm: fix release version in rpm change log
Signed-off-by: Thomas Haller <thaller@redhat.com>
2014-05-07 18:16:36 +02:00
Thomas Haller
cc45fe0a7e contrib/rpm: add spec file and script to build a RPM package
This one spec file is intended to build packages for F18, F19, F20, and
rhel-7.0.

The build script can be tweaked by setting environment variables, but it
is supposed to choose the right default values on it's own.

Signed-off-by: Thomas Haller <thaller@redhat.com>
2014-05-07 17:14:36 +02:00