rpms/i3/devel i3.spec,1.3,1.4

[Simon Wesp]

Author: cassmodiah

Update of /cvs/pkgs/rpms/i3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17456

Modified Files:
	i3.spec 
Log Message:
* Sun Dec 27 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 3.d.bf1-2
- Add missing Requires for a functional minimal (not comfortable) i3-system. (The requirements provides functions which are used in the standard configfile)
- Build manpages and add them to main-pkg
- Build doxygen generated documentation and add them to the documentation subpackage



Index: i3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/i3/devel/i3.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- i3.spec	25 Dec 2009 23:10:37 -0000	1.3
+++ i3.spec	27 Dec 2009 21:06:26 -0000	1.4
@@ -2,7 +2,7 @@
 
 Name:           i3
 Version:        3.d.bf1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Improved tiling window manager
 
 Group:          User Interface/Desktops
@@ -19,7 +19,10 @@ BuildRequires:  libxkbfile-devel
 BuildRequires:  libX11-devel
 BuildRequires:  bison
 BuildRequires:  flex
+BuildRequires:  asciidoc
 Requires:       rxvt-unicode
+Requires:       xorg-x11-apps
+Requires:       dmenu
 
 
 %description
@@ -36,12 +39,13 @@ Please be aware that i3 is primarily tar
 %package doc
 Summary:        Documentation for %{name}
 Group:          Documentation
-BuildRequires:  asciidoc
+BuildRequires:  doxygen
+BuildArch:      noarch
 Requires:       %{name} = %{version}-%{release}
 
 
 %description doc
-Asciidoc generated documentations for %{name}.
+Asciidoc and doxygen generated documentations for %{name}.
 
 
 %prep
@@ -59,15 +63,26 @@ sed -e 's|CFLAGS += -Wunused|CFLAGS += -
 
 %build
 make %{?_smp_mflags}
-cd docs; make %{?_smp_mflags}
+
+cd man; make %{?_smp_mflags}
+cd ../docs; make %{?_smp_mflags}
+
+cd ..
+doxygen pseudo-doc.doxygen
+mv pseudo-doc/html pseudo-doc/doxygen 
 
 
 %install
 rm -rf %{buildroot}
+
 make install \
      DESTDIR=%{buildroot} \
      INSTALL="install -p"
 
+mkdir -p %{buildroot}/%{_mandir}/man1/
+install -Dpm0644 man/*.1 \
+        %{buildroot}/%{_mandir}/man1/
+
 
 %clean
 rm -rf %{buildroot}
@@ -76,23 +91,27 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %doc GOALS LICENSE RELEASE-NOTES-%{upstream_version}
-%{_bindir}/%{name}
-%{_bindir}/%{name}-input
-%{_bindir}/%{name}-msg
+%{_bindir}/%{name}*
 %dir %{_sysconfdir}/%{name}/
 %config(noreplace) %{_sysconfdir}/%{name}/config
 %config %{_sysconfdir}/%{name}/welcome
 %{_datadir}/xsessions/%{name}.desktop
+%{_mandir}/man1/%{name}*
 
 
 %files doc
 %defattr(-,root,root,-)
-%doc docs/*.{html,png}
+%doc docs/*.{html,png} pseudo-doc/doxygen/
 
 
 %changelog
+* Sun Dec 27 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 3.d.bf1-2
+- Add missing Requires for a functional minimal (not comfortable) i3-system. (The requirements provides functions which are used in the standard configfile)
+- Build manpages and add them to main-pkg
+- Build doxygen generated documentation and add them to the documentation subpackage
+
 * Fri Dec 25 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 3.d.bf1-1
-- Correct version (https://www.redhat.com/archives/fedora-devel-list/2009-December/msg01102.html) Thank you Michael
+- Correct version-tag (https://www.redhat.com/archives/fedora-devel-list/2009-December/msg01102.html) Thank you Michael
 - Add more documentation (generated with asciidoc)
 
 * Fri Dec 25 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 3.d-bf1_1