diff options
| author | Tomas Babej <tbabej@redhat.com> | 2014-06-02 07:50:12 +0200 |
|---|---|---|
| committer | Petr Viktorin <pviktori@redhat.com> | 2014-06-16 19:48:20 +0200 |
| commit | 3bb9e1bbd5c8ae42e113b52dc88f9ec75b9b1142 (patch) | |
| tree | ff5183da90063cb1cb47f249b76312baaec9da23 /freeipa.spec.in | |
| parent | a9a4bc08485130fc1bb2257292b415e70e33bfb1 (diff) | |
| download | freeipa-3bb9e1bbd5c8ae42e113b52dc88f9ec75b9b1142.tar.gz freeipa-3bb9e1bbd5c8ae42e113b52dc88f9ec75b9b1142.tar.xz freeipa-3bb9e1bbd5c8ae42e113b52dc88f9ec75b9b1142.zip | |
ipaplatform: Change makefiles to accomodate for new platform package
https://fedorahosted.org/freeipa/ticket/4052
Reviewed-By: Petr Viktorin <pviktori@redhat.com>
Diffstat (limited to 'freeipa.spec.in')
| -rw-r--r-- | freeipa.spec.in | 50 |
1 files changed, 14 insertions, 36 deletions
diff --git a/freeipa.spec.in b/freeipa.spec.in index b71c99435..b719b4a21 100644 --- a/freeipa.spec.in +++ b/freeipa.spec.in @@ -348,21 +348,13 @@ export JAVA_STACK_SIZE="8m" %endif export CFLAGS="%{optflags} $CFLAGS" export LDFLAGS="%{__global_ldflags} $LDFLAGS" -%if 0%{?fedora} >= 19 -export SUPPORTED_PLATFORM=fedora19 -%else -%if 0%{?fedora} >= 18 -# use fedora18 platform which is based on fedora16 platform with systemd -# support + fedora18 changes -export SUPPORTED_PLATFORM=fedora18 -%else -export SUPPORTED_PLATFORM=fedora16 -%endif -%endif # Force re-generate of platform support export IPA_VENDOR_VERSION_SUFFIX=-%{release} -rm -f ipapython/services.py ipapython/version.py +rm -f ipapython/version.py +rm -f ipaplatform/services.py +rm -f ipaplatform/tasks.py +rm -f ipaplatform/paths.py make version-update cd ipa-client; ../autogen.sh --prefix=%{_usr} --sysconfdir=%{_sysconfdir} --localstatedir=%{_localstatedir} --libdir=%{_libdir} --mandir=%{_mandir}; cd .. %if ! %{ONLY_CLIENT} @@ -378,20 +370,12 @@ make IPA_VERSION_IS_GIT_SNAPSHOT=no %{?_smp_mflags} client %install rm -rf %{buildroot} -%if 0%{?fedora} >= 19 -export SUPPORTED_PLATFORM=fedora19 -%else -%if 0%{?fedora} >= 18 -# use fedora18 platform which is based on fedora16 platform with systemd -# support + fedora18 changes -export SUPPORTED_PLATFORM=fedora18 -%else -export SUPPORTED_PLATFORM=fedora16 -%endif -%endif # Force re-generate of platform support export IPA_VENDOR_VERSION_SUFFIX=-%{release} -rm -f ipapython/services.py ipapython/version.py +rm -f ipapython/version.py +rm -f ipaplatform/services.py +rm -f ipaplatform/tasks.py +rm -f ipaplatform/paths.py make version-update %if ! %{ONLY_CLIENT} make install DESTDIR=%{buildroot} @@ -844,21 +828,15 @@ fi %defattr(-,root,root,-) %doc COPYING README Contributors.txt %dir %{python_sitelib}/ipapython -%dir %{python_sitelib}/ipapython/platform -%dir %{python_sitelib}/ipapython/platform/base -%dir %{python_sitelib}/ipapython/platform/fedora16 -%dir %{python_sitelib}/ipapython/platform/fedora18 -%dir %{python_sitelib}/ipapython/platform/fedora19 -%dir %{python_sitelib}/ipapython/platform/redhat %{python_sitelib}/ipapython/*.py* -%{python_sitelib}/ipapython/platform/*.py* -%{python_sitelib}/ipapython/platform/base/*.py* -%{python_sitelib}/ipapython/platform/fedora16/*.py* -%{python_sitelib}/ipapython/platform/fedora18/*.py* -%{python_sitelib}/ipapython/platform/fedora19/*.py* -%{python_sitelib}/ipapython/platform/redhat/*.py* %dir %{python_sitelib}/ipalib %{python_sitelib}/ipalib/* +%dir %{python_sitelib}/ipaplatform +%dir %{python_sitelib}/ipaplatform/base +%dir %{python_sitelib}/ipaplatform/fedora +%{python_sitelib}/ipaplatform/* +%{python_sitelib}/ipaplatform/base/*.py* +%{python_sitelib}/ipaplatform/fedora/*.py* %attr(0644,root,root) %{python_sitearch}/default_encoding_utf8.so %{python_sitelib}/ipapython-*.egg-info %{python_sitelib}/freeipa-*.egg-info |