rpms/xscreensaver/FC-6 xscreensaver-5.02-pidnumber-write_long.patch, NONE, 1.1 xscreensaver-5.03-webcollage-default-nonet.patch, NONE, 1.1 xscreensaver.spec, 1.37, 1.38 xscreensaver-5.00b5-include-directory.patch, 1.1, NONE xscreensaver-5.01-webcollage-default-nonet.patch, 1.1, NONE xscreensaver-5.01a1-pam-popup-passwindow.patch, 1.1, NONE
Mamoru Tasaka (mtasaka)
fedora-extras-commits at redhat.com
Tue Aug 28 19:19:21 UTC 2007
- Previous message: rpms/xscreensaver/F-7 xscreensaver-5.02-pidnumber-write_long.patch, NONE, 1.1 xscreensaver-5.03-webcollage-default-nonet.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 xscreensaver.spec, 1.39, 1.40 xscreensaver-5.00b5-include-directory.patch, 1.1, NONE xscreensaver-5.01-webcollage-default-nonet.patch, 1.1, NONE
- Next message: rpms/xscreensaver/devel xscreensaver-5.03-webcollage-default-nonet.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 xscreensaver.spec, 1.42, 1.43 xscreensaver-5.01-webcollage-default-nonet.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mtasaka
Update of /cvs/extras/rpms/xscreensaver/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15357/FC-6
Modified Files:
xscreensaver.spec
Added Files:
xscreensaver-5.02-pidnumber-write_long.patch
xscreensaver-5.03-webcollage-default-nonet.patch
Removed Files:
xscreensaver-5.00b5-include-directory.patch
xscreensaver-5.01-webcollage-default-nonet.patch
xscreensaver-5.01a1-pam-popup-passwindow.patch
Log Message:
* Wed Aug 29 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-1
- Update to 5.03
xscreensaver-5.02-pidnumber-write_long.patch:
--- NEW FILE xscreensaver-5.02-pidnumber-write_long.patch ---
--- xscreensaver-5.02/driver/subprocs.c.pidnum_debug 2007-03-15 17:23:37.000000000 +0900
+++ xscreensaver-5.02/driver/subprocs.c 2007-08-28 16:40:38.000000000 +0900
@@ -93,7 +93,7 @@
num = -num;
}
- while ((num > 0) && (num_digits < sizeof(string - 1)))
+ while ((num > 0) && (num_digits < sizeof(string) - 1))
{
int digit;
digit = (int) num % 10;
xscreensaver-5.03-webcollage-default-nonet.patch:
--- NEW FILE xscreensaver-5.03-webcollage-default-nonet.patch ---
--- xscreensaver-5.03/driver/XScreenSaver.ad.in.nonet 2007-07-17 18:01:47.000000000 +0900
+++ xscreensaver-5.03/driver/XScreenSaver.ad.in 2007-08-29 01:39:14.000000000 +0900
@@ -304,10 +304,12 @@
celtic -root \n\
cwaves -root \n\
m6502 -root \n\
-- default-n: webcollage -root \n\
+- default-n: webcollage -root \
+ -directory @DEFAULT_IMAGE_DIRECTORY@ \n\
- default-n: "WebCollage (whacked)" \
webcollage -root -filter \
- 'vidwhacker -stdin -stdout' \n\
+ 'vidwhacker -stdin -stdout' \
+ -directory @DEFAULT_IMAGE_DIRECTORY@ \n\
- default-n: vidwhacker -root \n\
\
@GL_KLUDGE@ GL: gears -root \n\
--- xscreensaver-5.03/hacks/config/webcollage.xml.nonet 2006-03-20 21:47:40.000000000 +0900
+++ xscreensaver-5.03/hacks/config/webcollage.xml 2007-08-29 01:33:52.000000000 +0900
@@ -20,7 +20,7 @@
<string id="filter2" _label="Overall Filter Program" arg="-filter2 %"/>
-<!-- <file id="dictionary" _label="Dictionary File" arg="-dictionary %"/> -->
+ <file id="directory" _label="Image search directory" arg="-directory %"/>
<_description>
This program makes collages out of random images pulled off of the
Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/FC-6/xscreensaver.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- xscreensaver.spec 14 May 2007 15:55:02 -0000 1.37
+++ xscreensaver.spec 28 Aug 2007 19:18:48 -0000 1.38
@@ -1,9 +1,11 @@
%define name xscreensaver
-%define version 5.02
+%define version 5.03
%define beta_ver %{nil}
%define fedora_rel 1
+%define extrarel %{nil}
+
%if 0%{?fedora} >= 7
%define default_text %{_datadir}/doc/HTML/README-Accessibility
%else
@@ -20,15 +22,15 @@
Summary: X screen saver and locker
Name: %{name}
Version: %{version}
-Release: %{fedora_rel}%{?dist}%{?extrarel}.1
+Release: %{fedora_rel}%{?dist}%{?extrarel}
Epoch: 1
License: BSD
Group: Amusements/Graphics
URL: http://www.jwz.org/xscreensaver/
Source0: http://www.jwz.org/xscreensaver/xscreensaver-%{version}%{?beta_ver}.tar.gz
Patch1: xscreensaver-5.00b5-sanitize-hacks.patch
-Patch8: xscreensaver-5.00b5-include-directory.patch
-Patch21: xscreensaver-5.01-webcollage-default-nonet.patch
+Patch21: xscreensaver-5.03-webcollage-default-nonet.patch
+Patch40: xscreensaver-5.02-pidnumber-write_long.patch
Requires: xscreensaver-base = %{epoch}:%{version}-%{release}
Requires: xscreensaver-extras = %{epoch}:%{version}-%{release}
Requires: xscreensaver-gl-extras = %{epoch}:%{version}-%{release}
@@ -41,6 +43,7 @@
BuildRequires: sed
BuildRequires: libtool
BuildRequires: bc
+BuildRequires: gawk
BuildRequires: pam-devel > %{pam_ver}
BuildRequires: xorg-x11-proto-devel
BuildRequires: libX11-devel, libXScrnSaver-devel, libXext-devel
@@ -150,8 +153,8 @@
%setup -q -n %{name}-%{version}%{?beta_ver}
%patch1 -p1 -b .sanitize-hacks
-%patch8 -p1 -b .include-dir
%patch21 -p1 -b .nonet
+%patch40 -p1 -b .pidnum_debug
change_option(){
set +x
@@ -191,6 +194,7 @@
# change some options
change_option driver/XScreenSaver.ad.in \
+ captureStderr=False \
passwdTimeout=0:00:15 \
grabDesktopImages=False \
lock=True \
@@ -274,26 +278,36 @@
rm -rf ${RPM_BUILD_ROOT}
+# We have to make sure these directories exist,
+# or nothing will be installed into them.
+#
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pam.d
+
make install_prefix=$RPM_BUILD_ROOT INSTALL="install -c -p" install
desktop-file-install --vendor gnome --delete-original \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
--add-only-show-in GNOME \
+ --add-category DesktopSettings \
+%if 0%{?fedora} <= 7
--add-category X-Red-Hat-Base \
+%else
+ --remove-category Appearance \
+ --remove-category AdvancedSettings \
+ --remove-category Application \
+%endif
$RPM_BUILD_ROOT%{_datadir}/applications/*.desktop
# This function prints a list of things that get installed.
# It does this by parsing the output of a dummy run of "make install".
list_files() {
- echo "%%defattr(-,root,root)"
+ echo "%%defattr(-,root,root,-)"
make -s install_prefix=${RPM_BUILD_ROOT} INSTALL=true "$@" \
- | sed -e 's|directory* \([^ ][^ ]*\)$|/%%dir\1|' \
| sed -n -e 's at .* \(/[^ ]*\)$@\1 at p' \
- | sed -e "s@${RPM_BUILD_ROOT}@@" \
+ | sed -e "s@^${RPM_BUILD_ROOT}@@" \
-e "s@/[a-z][a-z]*/\.\./@/@" \
- | sed -e '/%%dir/!s@\(.*/man/.*\)@\1\*@' \
- -e '/%%dir/!s@\(.*/pam\.d/\)@%%config(noreplace) \1@' \
- -e 's|/%%dir\([^ ][^ ]*\)$|%%dir \1|' \
+ | sed -e 's@\(.*/man/.*\)@%%doc \1\*@' \
+ -e 's@\(.*/pam\.d/\)@%%config(noreplace) \1@' \
| sort \
| uniq
}
@@ -301,6 +315,10 @@
# Generate three lists of files for the three packages.
#
dd=%{_builddir}/%{name}-%{version}%{?beta_ver}
+
+# In case rpm -bi --short-circuit is tried multiple times:
+rm -f $dd/*.files
+
( cd hacks ; list_files install ) > $dd/extras.files
( cd hacks/glx ; list_files install ) > $dd/gl-extras.files
( cd driver ; list_files install ) > $dd/base.files
@@ -312,26 +330,17 @@
done
popd
+# add directory
+pushd $RPM_BUILD_ROOT
+for dir in `find .%{_prefix} -type d | grep xscreensaver` ; do
+ echo "%%dir ${dir#.}" >> $dd/base.files
+done
+popd
+
%find_lang %{name}
cat %{name}.lang | uniq >> $dd/base.files
# suppress rpmlint booing
-# remove directories explicitly included in filesystem rpm
-for f in \
- %{_sysconfdir}/pam.d \
- %{_bindir} \
- %{_datadir}/applications \
- %{_datadir}/pixmaps \
- %{_datadir}/X11/app-defaults \
- %{_mandir}/man[1-9] \
- ; do
- :
- ff=`echo $f | sed -e 's|\/|\\\\\\\\\/|g'`
- for g in $dd/*.files ; do
- eval sed -i -e \/$ff\$\/d $g
- done
-done
-
# sanitize path in script file
for f in ${RPM_BUILD_ROOT}%{_bindir}/xscreensaver-getimage-* \
${RPM_BUILD_ROOT}%{_libexecdir}/xscreensaver/vidwhacker \
@@ -374,14 +383,16 @@
SAVERDIR=%{_datadir}/applications/screensavers
mkdir -p ${RPM_BUILD_ROOT}${SAVERDIR}
+echo "%%dir $SAVERDIR" >> base.files
for list in *extras.files ; do
glist=gnome-$list
rm -f $glist
- echo "%%defattr(-,root,root)" > $glist
- echo "%%dir $SAVERDIR" >> $glist
+ echo "%%defattr(-,root,root,-)" > $glist
+## move the owner of $SAVERDIR to -base
+## echo "%%dir $SAVERDIR" >> $glist
set +x
for xml in `cat $list | grep xml$` ; do
@@ -404,24 +415,45 @@
rm -rf ${RPM_BUILD_ROOT}
%files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
%files -f base.files base
-%defattr(-,root,root)
+%defattr(-,root,root,-)
%files -f extras.files extras
-%defattr(-,root,root)
+%defattr(-,root,root,-)
%files -f gl-extras.files gl-extras
-%defattr(-,root,root)
+%defattr(-,root,root,-)
%files -f gnome-extras.files extras-gss
-%defattr(-,root,root)
+%defattr(-,root,root,-)
%files -f gnome-gl-extras.files gl-extras-gss
-%defattr(-,root,root)
+%defattr(-,root,root,-)
%changelog
+* Wed Aug 29 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-1
+- Update to 5.03
+
+* Tue Aug 28 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.02-4
+- Spec file cleanup
+ - Don't use include-directory patch anymore
+ - Make all xscreensaver related directories owned by -base subpackage
+ because now -extras and -gl-extras subpackage require it.
+ - Mark man files as %%doc explicitly, because %_mandir is expanded
+ in files list
+- Fix write_long() (actually no_malloc_number_to_string())
+
+* Wed Aug 22 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.02-3.dist.1
+- Mass rebuild (buildID or binutils issue)
+
+* Tue Aug 14 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.02-3
+- Remove man6x from file entry, now included in filesystem
+
+* Sun Aug 12 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.02-2
+- Fix up desktop categories
+
* Sat Apr 21 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.02-1
- Update to 5.02
--- xscreensaver-5.00b5-include-directory.patch DELETED ---
--- xscreensaver-5.01-webcollage-default-nonet.patch DELETED ---
--- xscreensaver-5.01a1-pam-popup-passwindow.patch DELETED ---
- Previous message: rpms/xscreensaver/F-7 xscreensaver-5.02-pidnumber-write_long.patch, NONE, 1.1 xscreensaver-5.03-webcollage-default-nonet.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 xscreensaver.spec, 1.39, 1.40 xscreensaver-5.00b5-include-directory.patch, 1.1, NONE xscreensaver-5.01-webcollage-default-nonet.patch, 1.1, NONE
- Next message: rpms/xscreensaver/devel xscreensaver-5.03-webcollage-default-nonet.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 xscreensaver.spec, 1.42, 1.43 xscreensaver-5.01-webcollage-default-nonet.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list