rpms/ctrlproxy/devel ctrlproxy.spec,1.1,1.2
David Woodhouse (dwmw2)
fedora-extras-commits at redhat.com
Sun Jun 19 16:09:12 UTC 2005
Author: dwmw2
Update of /cvs/extras/rpms/ctrlproxy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9518
Modified Files:
ctrlproxy.spec
Log Message:
Fix specfile according to critique from jwb and Michael Schwendt
Index: ctrlproxy.spec
===================================================================
RCS file: /cvs/extras/rpms/ctrlproxy/devel/ctrlproxy.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ctrlproxy.spec 19 Jun 2005 16:05:49 -0000 1.1
+++ ctrlproxy.spec 19 Jun 2005 16:09:10 -0000 1.2
@@ -1,13 +1,13 @@
Summary: ctrlproxy
Name: ctrlproxy
Version: 2.6.2
-Release: 1
+Release: 2
License: GPL
Group: Applications/Internet
Source: http://jelmer.vernstok.nl/releases/ctrlproxy-%{version}.tar.gz
Url: http://jelmer.vernstok.nl/ctrlproxy/
-BuildRoot: /var/tmp/%{name}-buildroot
-BuildRequires: xmlto, libxml2-devel, glib2-devel, popt
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: xmlto, libxml2-devel, glib2-devel, popt, pcre-devel, openssl-devel
%description
ctrlproxy is an IRC server with multiserver support. It runs as a dæmon
@@ -33,39 +33,45 @@
%install
[ -d "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
mkdir $RPM_BUILD_ROOT
-%makeinstall \
+make install-dirs install-bin install-mods install-data \
+ bindir=$RPM_BUILD_ROOT/%{_bindir} \
mandir=$RPM_BUILD_ROOT/%{_mandir} \
man1dir=$RPM_BUILD_ROOT/%{_mandir}/man1 \
man5dir=$RPM_BUILD_ROOT/%{_mandir}/man5 \
man7dir=$RPM_BUILD_ROOT/%{_mandir}/man7 \
- docdir=$RPM_BUILD_ROOT/usr/share/doc/ctrlproxy-%{version} \
modulesdir=$RPM_BUILD_ROOT/%{_libdir}/ctrlproxy \
+ includedir=$RPM_BUILD_ROOT/%{_includedir} \
+ docdir=$RPM_BUILD_ROOT/%{_defaultdocdir}/ctrlproxy-%{version} \
moddir=$RPM_BUILD_ROOT/%{_libdir}/ctrlproxy \
- cdatadir=$RPM_BUILD_ROOT/usr/share/ctrlproxy
+ cdatadir=$RPM_BUILD_ROOT/%{_datadir}/ctrlproxy
+install -m 0755 ctrlproxy-setup $RPM_BUILD_ROOT/%{_bindir}
+
cd doc
-gzip -9 ctrlproxy.1 ctrlproxyrc.5 *.7ctrlproxy
/usr/bin/install -d ${RPM_BUILD_ROOT}/%{_mandir}/man1
-/usr/bin/install ctrlproxy.1.gz ${RPM_BUILD_ROOT}/%{_mandir}/man1
+/usr/bin/install ctrlproxy.1 ${RPM_BUILD_ROOT}/%{_mandir}/man1
/usr/bin/install -d ${RPM_BUILD_ROOT}/%{_mandir}/man5
-/usr/bin/install ctrlproxyrc.5.gz ${RPM_BUILD_ROOT}/%{_mandir}/man5
+/usr/bin/install ctrlproxyrc.5 ${RPM_BUILD_ROOT}/%{_mandir}/man5
/usr/bin/install -d ${RPM_BUILD_ROOT}/%{_mandir}/man7
-/usr/bin/install *.7ctrlproxy.gz ${RPM_BUILD_ROOT}/%{_mandir}/man7
+/usr/bin/install *.7ctrlproxy ${RPM_BUILD_ROOT}/%{_mandir}/man7
%clean
[ -d "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
%files
-%defattr(-,root,root)
-%doc AUTHORS COPYING TODO README ChangeLog
-/usr/bin/*
+%defattr(0644,root,root)
+%doc AUTHORS COPYING TODO README ChangeLog ctrlproxyrc.example ctrlproxyrc.dtd
+%attr(0755,root,root) %{_bindir}/*
%{_mandir}/*/*
%dir /%{_libdir}/ctrlproxy
-/%{_libdir}/ctrlproxy/*
-/usr/include/*
-%dir /usr/share/ctrlproxy
-/usr/share/ctrlproxy/*
+%{_libdir}/ctrlproxy/*
+%dir %{_datadir}/ctrlproxy
+%{_datadir}/ctrlproxy/*
%changelog
+* Sun Jun 19 2005 David Woodhouse <dwmw2 at infradead.org> 2.6.2-2
+- Fix file modes
+- Drop ctrlproxy.h from package
+
* Fri Jun 17 2005 David Woodhouse <dwmw2 at infradead.org> 2.6.2-1
- Update for the 2.6.2 release.
- Make manpages
More information about the scm-commits
mailing list