commit 2f5fe60650efbf09db64c685dda99c520d77490e
Author: paragn <paragn at fedoraproject.org>
Date: Mon Sep 27 15:18:23 2010 +0530
- Merge-review cleanup (#226652)
xorg-x11-xfwp.spec | 24 +++++++++++-------------
1 files changed, 11 insertions(+), 13 deletions(-)
---
diff --git a/xorg-x11-xfwp.spec b/xorg-x11-xfwp.spec
index f96270f..bbb0e44 100644
--- a/xorg-x11-xfwp.spec
+++ b/xorg-x11-xfwp.spec
@@ -5,7 +5,7 @@ Summary: X.Org X11 X firewall proxy
Name: xorg-x11-%{pkgname}
# NOTE: The package version should always be the upstream xfwp tarball version.
Version: %{xfwp_version}
-Release: 11%{?dist}
+Release: 12%{?dist}
License: MIT
Group: User Interface/X
URL: http://www.x.org
@@ -22,8 +22,9 @@ BuildRequires: automake autoconf libtool
BuildRequires: pkgconfig
BuildRequires: libICE-devel libXt-devel
BuildRequires: xorg-x11-proto-devel
-BuildRequires: xorg-x11-util-macros >= 1.0.0
+BuildRequires: xorg-x11-util-macros
+# FIXME:These old provides should be removed
Provides: xfwp proxymngr xfindproxy
%description
@@ -44,31 +45,26 @@ firewall.
case $pkg in
proxymngr*)
aclocal ; libtoolize --force ; automake ; autoconf
- ;;
- *)
- ;;
+ ;;
+ *)
+ ;;
esac
%configure
- make
+ make %{?_smp_mflags}
popd
done
}
%install
-rm -rf $RPM_BUILD_ROOT
-
# Install everything
{
for pkg in * ; do
pushd $pkg
- make install DESTDIR=$RPM_BUILD_ROOT
+ make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
popd
done
}
-%clean
-rm -rf $RPM_BUILD_ROOT
-
%files
%defattr(-,root,root,-)
%doc
@@ -77,12 +73,14 @@ rm -rf $RPM_BUILD_ROOT
%{_bindir}/xfwp
%dir %{_libdir}/X11/proxymngr
%{_libdir}/X11/proxymngr/pmconfig
-#%dir %{_mandir}/man1x
%{_mandir}/man1/proxymngr.1*
%{_mandir}/man1/xfindproxy.1*
%{_mandir}/man1/xfwp.1*
%changelog
+* Sat Sep 25 2010 Parag Nemade <paragn AT fedoraproject.org> - 1.0.1-12
+- Merge-review cleanup (#226652)
+
* Thu Mar 04 2010 Matěj Cepl <mcepl at redhat.com> - 1.0.1-11
- Fixed bad directory ownership of /usr/share/X11