diff --git a/cinnamon-session.spec b/cinnamon-session.spec index 20b67d7..c5eb5fa 100644 --- a/cinnamon-session.spec +++ b/cinnamon-session.spec @@ -4,7 +4,7 @@ Summary: Cinnamon session manager Name: cinnamon-session Version: 2.0.5 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://cinnamon.linuxmint.com # To generate tarball # wget https://github.com/linuxmint/cinnamon-session/tarball/%%{_internal_version} -O cinnamon-session-%%{version}.git%%{_internal_version}.tar.gz @@ -42,8 +42,9 @@ BuildRequires: pkgconfig(json-glib-1.0) # this is so the configure checks find /usr/bin/halt etc. BuildRequires: usermode - +%if 0%{?fedora} BuildRequires: pkgconfig(pangox) +%endif BuildRequires: pkgconfig(xt) BuildRequires: pkgconfig(xtst) BuildRequires: pkgconfig(upower-glib) @@ -64,11 +65,12 @@ the other core components and handles logout and saving the session. %setup -q %patch0 -p1 %patch1 -p1 -b .upower_deprecated +rm missing NOCONFIGURE=1 ./autogen.sh %build %configure --enable-docbook-docs \ -%if 0%{?fedora} < 20 +%if 0%{?fedora} < 20 || 0%{?rhel} --docdir=%{_datadir}/doc/%{name}-%{version} \ %else --docdir=%{_datadir}/doc/%{name} \ @@ -78,7 +80,7 @@ NOCONFIGURE=1 ./autogen.sh make %{?_smp_mflags} V=1 %install -make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" +%{make_install} desktop-file-install \ --delete-original \ @@ -118,6 +120,9 @@ fi %{_datadir}/glib-2.0/schemas/org.cinnamon.SessionManager.gschema.xml %changelog +* Mon Jan 13 2014 Leigh Scott - 2.0.5-2 +- make changes for epel7 + * Sun Nov 10 2013 Leigh Scott - 2.0.5-1 - update to 2.0.5