Alan: > I've updated http://cr.opensolaris.org/~alanc/xscreensaver/ with > the revised spec and all the associated patch & copyright files. > Changes since I last sent it in: > - added xscreensaver-46-bug-6857559.patch for a new fix from RPE > that's gone into the X gate since the previous round of review > - updated xscreensaver-07-gtk-lock.patch to reflect the changes > putback to X for 6845751 (xscreensaver-lock chews CPU when > daemon dies while unlock dialog is up) in nv_117 > - provided both Solaris & OpenSolaris branding forms of the > xscreensaver-19-*-colors.patch > - fixed all the things Brian & Laca suggested in previous review, > including borrowing a hack from the Fedora spec file to generate > the files lists from the build by parsing "make install" output > instead of having to maintain a very long list of which hack modules > go into the regular vs. opengl hacks packages.
Looks good. > I think this is now ready to commit. What I still need to know is: > - which branches should I commit it to now? I'd think SVN head would be best. If you want this change to go into the Nevada stable builds, then you will need to get approval to put this into the 2.26 branch. We use this form to request for changes in the stable branch: http://lablx50.ireland/jdsrtc.php > - where do I put the Sun-logo versions of the branding .png files? > do those get committed to an internal repo? (Source3 & Source4 > in the spec file) Normally we put such files in the ext-sources directory, then if the spec file refers to Source#, they should just get picked up. > The contents are almost identical to what's in the Nevada WOS now, > but there are three changes to the way the packages are split: > > - the current SUNWxwsvr is split into SUNWxwsvr (legacy compatibility > links from /usr/openwin -> /usr/X11) and SUNWxscreensaver (the > actual xscreensaver software). This allows a more user friendly > name and simplified IPS package construction (instead of having > to exclude the /usr/openwin links from the IPS package, you simply > don't put SUNWxwsvr into IPS at all). > > - the current SUNWxscreensaver-hacks-gl is split into > SUNWxscreensaver-hacks-gl (OpenGL hacks from xscreensaver sources) > and SUNWrss-glx (OpenGL hacks from rss-glx project) so that they > can each have the correct version information and copyright/license > information. > > - currently X delivers a SUNW0xwsvr to l10n for translation, from > which they generate SUNW*xwsvr - those are replaced by > SUNWxscreensaver-l10n like other gnome packages. The l10n teams > will have to move their translations/obsolete the old packages > accordingly. That seems reasonable to me. Brian
