rpms/xscreensaver/devel xscreensaver-5.02-pidnumber-write_long.patch, NONE, 1.1 xscreensaver.spec, 1.41, 1.42 xscreensaver-5.00b5-include-directory.patch, 1.1, NONE
Mamoru Tasaka (mtasaka)
fedora-extras-commits at redhat.com
Tue Aug 28 08:04:25 UTC 2007
Author: mtasaka
Update of /cvs/extras/rpms/xscreensaver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23610
Modified Files:
xscreensaver.spec
Added Files:
xscreensaver-5.02-pidnumber-write_long.patch
Removed Files:
xscreensaver-5.00b5-include-directory.patch
Log Message:
* 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())
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;
Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/xscreensaver.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- xscreensaver.spec 21 Aug 2007 17:54:35 -0000 1.41
+++ xscreensaver.spec 28 Aug 2007 08:03:52 -0000 1.42
@@ -2,7 +2,7 @@
%define version 5.02
%define beta_ver %{nil}
-%define fedora_rel 3
+%define fedora_rel 4
%define extrarel %{nil}
@@ -22,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
+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}
@@ -43,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
@@ -152,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
@@ -276,18 +277,23 @@
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 \
- --add-category DesktopSettings \
%endif
$RPM_BUILD_ROOT%{_datadir}/applications/*.desktop
@@ -296,13 +302,11 @@
list_files() {
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
}
@@ -310,6 +314,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
@@ -321,27 +329,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] \
- %{_mandir}/man[1-9]x \
- ; 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 \
@@ -384,6 +382,7 @@
SAVERDIR=%{_datadir}/applications/screensavers
mkdir -p ${RPM_BUILD_ROOT}${SAVERDIR}
+echo "%%dir $SAVERDIR" >> base.files
for list in *extras.files ; do
@@ -391,7 +390,8 @@
rm -f $glist
echo "%%defattr(-,root,root,-)" > $glist
- echo "%%dir $SAVERDIR" >> $glist
+## move the owner of $SAVERDIR to -base
+## echo "%%dir $SAVERDIR" >> $glist
set +x
for xml in `cat $list | grep xml$` ; do
@@ -432,6 +432,15 @@
%defattr(-,root,root,-)
%changelog
+* 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)
--- xscreensaver-5.00b5-include-directory.patch DELETED ---
More information about the fedora-extras-commits
mailing list