Skip to content

Commit

Permalink
build: fedora review changes
Browse files Browse the repository at this point in the history
  • Loading branch information
Tim Lauridsen committed Oct 15, 2014
1 parent c668472 commit 2f4e6e0
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 35 deletions.
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ test-repo-build:

test-inst:
$(MAKE) test-release
@sudo dnf install build/noarch/*.rpm
@sudo dnf install build/RPMS/noarch/*$(PKGNAME)*.rpm

rpms:
$(MAKE) build-setup
Expand Down Expand Up @@ -155,9 +155,9 @@ test-release:
@git commit -a -m "updated ChangeLog"
# Make archive
@rm -rf ${APPNAME}-${NEW_VER}.tar.gz
@git archive --format=tar --prefix=$(PKGNAME)-$(NEW_VER)/ HEAD | xz >${PKGNAME}-$(NEW_VER).tar.xz
# Build RPMS
@-rpmbuild --define '_topdir $(BUILDDIR)'-ta ${PKGNAME}-${NEW_VER}.tar.xz
@git archive --format=tar --prefix=$(PKGNAME)-$(NEW_VER)/ HEAD | xz >build/SOURCES/${PKGNAME}-$(NEW_VER).tar.xz
# Build RPMS
@-rpmbuild --define '_topdir $(BUILDDIR)' -ba ${PKGNAME}.spec
@$(MAKE) test-cleanup


Expand Down
40 changes: 18 additions & 22 deletions dnfdaemon.spec
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,15 @@

Name: dnfdaemon
Version: 0.3.2
Release: 1%{?dist}
Release: 2%{?dist}
Summary: DBus daemon for dnf package actions
License: GPLv2+
URL: https://github.com/timlau/dnf-daemon
Source0: https://github.com/timlau/dnf-daemon/releases/download/%{name}-%{version}/%{name}-%{version}.tar.xz

BuildArch: noarch
BuildRequires: python3-devel
Requires: python3-gobject
Requires: python3-dbus
Requires: python3-dnf >= %{dnf_version}
Requires: polkit
Expand All @@ -31,32 +32,23 @@ Dbus daemon for performing package actions with the dnf package manager
make install DESTDIR=$RPM_BUILD_ROOT DATADIR=%{_datadir} SYSCONFDIR=%{_sysconfdir}

%package -n python3-%{name}
Summary: %{name} python support libs
Group: Applications/System
BuildRequires: python3-devel
Requires: python3-gobject

%description -n python3-%{name}
%{name} python support libs

%package -n python3-%{name}-client
Summary: Python 3 api for communicating with the dnf-daemon DBus service
Group: Applications/System
BuildRequires: python3-devel
Requires: %{name} = %{version}-%{release}
Requires: python3-gobject

%description -n python3-%{name}-client
%description -n python3-%{name}
Python 3 api for communicating with the dnf-daemon DBus service

%package -n python-%{name}-client
%package -n python-%{name}
Summary: Python 2 api for communicating with the dnf-daemon DBus service
Group: Applications/System
BuildRequires: python2-devel
Requires: %{name} = %{version}-%{release}
Requires: pygobject3

%description -n python-%{name}-client
%description -n python-%{name}
Python 2 api for communicating with the dnf-daemon DBus service

# apply the right selinux file context
Expand All @@ -79,22 +71,26 @@ fi
%{_datadir}/polkit-1/actions/%{dnf_org}*
# this should not be edited by the user, so no %%config
%{_sysconfdir}/dbus-1/system.d/%{dnf_org}*

%files -n python3-%{name}
%dir %{python3_sitelib}/%{name}
%{python3_sitelib}/%{name}/__*
%{python3_sitelib}/%{name}/server/*
%{python3_sitelib}/%{name}/server

%files -n python-%{name}-client
%{python_sitelib}/%{name}/__*
%{python_sitelib}/%{name}/client

%files -n python3-%{name}-client
%files -n python-%{name}
%{python_sitelib}/%{name}

%files -n python3-%{name}
%{python3_sitelib}/%{name}/client

%changelog
* Sun Sep 21 2014 Tim Lauridsen <[email protected]> 0.3.2-1
* Wed Oct 15 2014 Tim Lauridsen <[email protected]> 0.3.2-2
- include python3-dnfdaemon in the dnfdaemon main package
- renamed python?-dnfdaemon-client to python?-dnfdaemon
- include dir ownerships in the right packages

* Sun Oct 12 2014 Tim Lauridsen <[email protected]> 0.3.2-1
- bumped release
- fedora review cleanupso
- fedora review cleanups
- python-dnfdaemon-client should own %%{python_sitelib}/dnfdaemon/client
- group %%files sections
- use uploaded sources on github, not autogenerated ones.
Expand Down
3 changes: 0 additions & 3 deletions rel-eng/packages/.readme

This file was deleted.

1 change: 0 additions & 1 deletion rel-eng/packages/dnfdaemon

This file was deleted.

5 changes: 0 additions & 5 deletions rel-eng/tito.props

This file was deleted.

0 comments on commit 2f4e6e0

Please sign in to comment.