rpms/rhgb/devel rhgb.spec,1.73,1.74

Wed Apr 18 22:39:33 UTC 2007

Author: mclasen

Update of /cvs/dist/rpms/rhgb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28021

Modified Files:
	rhgb.spec 
Log Message:
fix a spec file accident



Index: rhgb.spec
===================================================================
RCS file: /cvs/dist/rpms/rhgb/devel/rhgb.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74

--- rhgb.spec	18 Apr 2007 22:31:35 -0000	1.73
+++ rhgb.spec	18 Apr 2007 22:39:30 -0000	1.74
@@ -3,15 +3,18 @@
 Summary: Red Hat Graphical Boot
 Name: rhgb
 Version: 0.17.6
-Release: 1
+Release: 1%{?dist}
 URL: http://www.redhat.com/
 Source0: %{name}-%{version}.tar.gz
 License: GPL
 Group: System Environment/Base
-BuildRoot: %{_tmppath}/%{name}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExcludeArch: s390 s390x ppc64
 BuildRequires: vte-devel
+BuildRequires: gettext
+BuildRequires: libxf86config-devel >= 1.1.1-7
 Requires: initscripts >= 7.22-1
+Requires: system-logos
 
 %description
 Red Hat Graphical Boot provides a clean and simple interface to the boot process
@@ -21,11 +24,15 @@
 
 %build
 %configure
-make %{?_smp_mflags}
+
+# FIXME: need to drop the CPPFLAGS junk and fix this upstream 
+# (as well as upstream all the patches that have built up)
+make %{?_smp_mflags} \
+     CPPFLAGS="-I$(pkg-config --variable sdkdir xorg-server)"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT \
 
 %find_lang %{gettext_package}
 
@@ -34,14 +41,150 @@
 
 %files -f %{gettext_package}.lang
 %defattr(-,root,root)
-
+%doc doc/HOW_IT_WORKS
 %{_bindir}/*
+%dir %{_datadir}/rhgb
 %{_datadir}/rhgb
-/etc/rhgb
-/etc/rhgb/temp
-%doc doc/HOW_IT_WORKS
+%dir %{_sysconfdir}/rhgb
+%{_sysconfdir}/rhgb/*
+%dir %{_sysconfdir}/rhgb/temp
 
 %changelog
+* Wed Apr 18 2007 Matthias Clasen <mclasen at redhat.com> - 0.17.6-1
+- Fix two swapped highlight colors
+
+* Tue Apr  3 2007 Ray Strode <rstrode at redhat.com> - 0.17.5-1
+- don't bail if /etc/mtab isn't around. Patch by Jeremy Katz
+  <katzj at redhat.com>, bug 235146.
+
+* Tue Apr  3 2007 Ray Strode <rstrode at redhat.com> - 0.17.4-1
+- Fix some descriptions. Patch by Baris Cicek <baris at nerd.com.tr>
+  bug 143954
+
+* Wed Mar 21 2007 Matthias Clasen  <mclasen at redhat.com> - 0.17.3-1
+- Fix some more small color issues
+
+* Tue Mar 20 2007 Ray Strode <rstrode at redhat.com> - 0.17.2-2
+- pass -br by default
+
+* Wed Feb 21 2007 Matthias Clasen <mclasen at redhat.com> - 0.17.2-1
+- Fix some small color issues
+
+* Mon Feb 19 2007 Matthias Clasen <mclasen at redhat.com> - 0.17.1-1
+- Fix some glitches in the new theme
+
+* Sun Feb 18 2007 Matthias Clasen <mclasen at redhat.com> - 0.17-1
+- New artwork
+- All patches moved to cvs
+
+* Tue Dec 19 2006 Adam Jackson <ajax at redhat.com> - 0.16.4-4
+- rhgb-0.16.4-wait-for-server-to-exit.patch: Added, wait for the X server
+  to shut down before exiting.
+
+* Wed Oct 25 2006 Ray Strode <rstrode at redhat.com> - 0.16.4-3
+- kill rhgb before gdm starts to prevent weird vt switching
+  behavior (bug 211848)
+
+* Wed Oct 18 2006 Ray Strode <rstrode at redhat.com> - 0.16.4-2
+- don't execute interactive bash shell during setup (bug 209457)
+- drop the change vts code in the exit path, Adam Jackson says 
+  that the code is dead code and X will do the right thing.
+
+* Thu Oct 12 2006 Matthias Clasen <mclasen at redhat.com> - 0.16.4-1
+- Update to 0.16.4 to pick up new translations  (#
+
+* Tue Sep 26 2006 Ray Strode <rstrode at redhat.com> - 0.16.3-6
+- don't SIGKILL X server
+- wait for signal from X server that it's ready instead of
+  just launching it an hoping for the best
+- only vt switch if things go bad, X and gdm will handle 
+  making sure the right vt is active.
+- don't ever change the busy cursor to not busy (if we're not
+  busy then rhgb shouldn't be running).  
+
+* Wed Jul 26 2006 Mike A. Harris <mharris at redhat.com> 0.16.3-5
+- Bump libxf86config-devel dep to ensure the fix for (#198653) is present.
+- Ensure the package has ownership of the dirs it creates.
+- Use Fedora Extras style BuildRoot tag.
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.16.3-4.1
+- rebuild
+
+* Wed Jul  5 2006 Ray Strode <rstrode at redhat.com> - 0.16.3-4
+- remove erroneous space from x conf filename.  Problem discovered
+  from Mary Ellen Foster <mefoster at gmail.com> (bug 196885)
+
+* Mon Jun  5 2006 Matthias Clasen <mclasen at redhat.com> - 0.16.3-3
+- Require system-logos, not fedora-logos
+
+* Wed May 10 2006 Matthias Clasen <mclasen at redhat.com> - 0.16.3-2
+- Rebuild
+
+* Wed Feb 22 2006 Matthias Clasen <mclasen at redhat.com> - 0.16.3-1
+- don't include the (old, unused) Fedora logo 
+
+* Mon Feb 13 2006 Jesse Keating <jkeating at redhat.com> - 0.16.2-21.2.1
+- rebump for build order issues during double-long bump
+
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.16.2-21.2
+- bump again for double-long bug on ppc(64)
+
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.16.2-21.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
+* Wed Jan 25 2006 Ray Strode <rstrode at redhat.com> 0.16.2-21
+- add lame hack to scale logos down if in low resolutions (bug 178737)
+
+* Fri Jan 20 2006 Ray Strode <rstrode at redhat.com> 0.16.2-20
+- update the logo in the corner
+
+* Thu Jan 19 2006 Ray Strode <rstrode at redhat.com> 0.16.2-19
+- change color scheme and use new images by Diana Fong
+
+* Sun Jan 8 2006 Ray Strode <rstrode at redhat.com> 0.16.2-18
+- rebuild against modular X
+
+* Thu Dec 22 2005 Jesse Keating <jkeating at redhat.com> 0.16.2-16
+- versioned BuildRequires of libxf86config-devel
+
+* Fri Dec 16 2005 Jesse Keating <jkeating at redhat.com>
+- rebuilt for new gcc
+
+* Mon Nov 21 2005 Ray Strode <rstrode at redhat.com> 0.16.2-13
+- Don't run /sbin/chvt and never call waitpid on child.  Instead
+  just change vts using the VT_ACTIVATE ioctl.  Patch from Peter
+  Jones <pjones at redhat.com>.
+- Get rid of some other calls to waitpid and just let glib
+  handle it.  The code was ignoring the return values anyway...
+- add a buildreq on libxf86config-devel
+
+* Sun Nov 13 2005 Jeremy Katz <katzj at redhat.com> - 0.16.2-12
+- fix fontpath for modular x
+
+* Sun Nov 13 2005 Jeremy Katz <katzj at redhat.com> - 0.16.2-11
+- switch paths to work with modular X
+
+* Thu Nov 10 2005 Ray Strode <rstrode at redhat.com> 0.16.2-10
+- Don't switch out of details view if the user switched into
+  it intially.  Patch from Mary Ellen Foster <mefoster at gmail.com>
+  (bug 151239).
+
+* Mon Oct 31 2005 Ray Strode <rstrode at redhat.com> 0.16.2-9
+- add BuildRequires: gettext
+- don't build in-tree copy of gtkexpander.c
+- don't switch to vt1 automatically after 35 seconds (bug 135783)
+
+* Wed Oct 26 2005 Ray Strode <rstrode at redhat.com> 0.16.2-8
+- clumens, zombie-hunter, spotted another one of the 
+  brain eaters
+
+* Wed Oct 26 2005 Ray Strode <rstrode at redhat.com> 0.16.2-7
+- initialize utf-8 mode on console
+
+* Wed Oct 26 2005 Ray Strode <rstrode at redhat.com> 0.16.2-6
+- Don't make setxkbmap hungry for brains 
+  (reported by Chris Lumens).
+
 * Sun Oct 09 2005 Florian La Roche <laroche at redhat.com>
 - fix rebuild problems
 


