Author: ankry Date: Sat Aug 12 08:26:12 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- formatting
---- Files affected:
SPECS:
AfterStep-APPS.spec (1.22 -> 1.23) , Zope3-zwiki.spec (1.3 -> 1.4)
---- Diffs:
================================================================
Index: SPECS/AfterStep-APPS.spec
diff -u SPECS/AfterStep-APPS.spec:1.22 SPECS/AfterStep-APPS.spec:1.23
--- SPECS/AfterStep-APPS.spec:1.22 Thu Nov 27 07:48:28 2003
+++ SPECS/AfterStep-APPS.spec Sat Aug 12 10:26:07 2006
@@ -12,8 +12,8 @@
Patch1: xiterm-utmp.patch
Patch2: as-apps-miniCHESS-change_install_dirs.patch
Patch3: as-apps-ascd-configure_and_install_bugfix.patch
-#Patch4: ascp-paths.patch
-#Patch5: aterm-utemp.patch
+#Patch4: ascp-paths.patch
+#Patch5: aterm-utemp.patch
Patch6: %{name}-home_etc.patch
URL: http://www.tigr.net/afterstep/
Requires: /usr/sbin/utempter
@@ -57,136 +57,119 @@
%build
mv ascd-0.12.1/ascd/themes/clean.tar ascd-0.12.1/ascd/themes/cleandir.tar
for package in `ls` ; do
- cd $package
- case $package in
- ascd-* )
- ./configure << EOF
+ cd $package
+ case $package in
+ ascd-* )
+ ./configure << EOF
/dev/cdrom
%{_bindir}
%{_mandir}/man1
%{_datadir}/afterstep/AScd
2
EOF
- xmkmf
- make Makefiles CXXDEBUGFLAGS="%{rpmcflags}" \
- CDEBUGFLAGS="%{rpmcflags}"
- make MANDIR=%{_mandir}/man1 \
- BINDIR=%{_bindir} \
- SHLIBDIR=%{_libdir} \
- CXXDEBUGFLAGS="%{rpmcflags}" \
- CDEBUGFLAGS="%{rpmcflags}"
- ;;
-
- aterm* )
- ## This program is provided by aterm rpm package.
-
- # configure2_13 --enable-utmp
- # make
- ;;
- asclock*)
- CFLAGS="%{rpmcflags}" ./configure --prefix=%{_prefix} << EOF
+ xmkmf
+ make Makefiles CXXDEBUGFLAGS="%{rpmcflags}" \
+ CDEBUGFLAGS="%{rpmcflags}"
+ make MANDIR=%{_mandir}/man1 \
+ BINDIR=%{_bindir} \
+ SHLIBDIR=%{_libdir} \
+ CXXDEBUGFLAGS="%{rpmcflags}" \
+ CDEBUGFLAGS="%{rpmcflags}"
+ ;;
+ aterm* )
+ ## This program is provided by aterm rpm package.
+ # configure2_13 --enable-utmp
+ # make
+ ;;
+ asclock*)
+ CFLAGS="%{rpmcflags}" ./configure --prefix=%{_prefix} << EOF
classic
EOF
- make CFLAGS="%{rpmcflags}"
- ;;
-
- ascp-* )
-
- ## There is strange problem with this program.
- ## The ./configure script tries to run /usr/local/bin/gtk-config
- ## program. In PLD it should be %{_bindir}/gtk-config.
- ##
- ## --with-gtk-prefix
- ## --with-gtk-exec-prefix
- ## or --disable-gtktest
- ## not help here. I don't now why.
-
-# export LD_LIBRARY_PATH=%{_prefix}/
- # configure2_13 \
- # --enable-i18n \
- # --x-includes=%{_includedir} \
- # --x-libraries=%{_libdir} \
- # --disable-gtktest
-# --with-gtk-prefix=%{_prefix} \
- # --with-gtk-exec-prefix=%{_bindir}
- # make
- ;;
-
- asfatm-* )
- ## <sensors/sensors.h> is needed to compile this program.
- ## I don't have it.
-
- # cd asfatm
- # make
- ;;
-
- asppp-* )
- ## xpminit.c:7: dial.xpm: No such file or directory
-
- # configure2_13
- # make
- ;;
-
- miniCHESS-* )
- #chess.c: In function `mouseGame':
- #chess.c:1667: `fd_set' undeclared (first use in this function)
- #chess.c:1667: (Each undeclared identifier is reported only once
- #chess.c:1667: for each function it appears in.)
- #chess.c:1667: parse error before `fdset'
- #chess.c:1687: `fdset' undeclared (first use in this function)
- #chess.c: In function `main':
- #chess.c:1975: warning: return type of `main' is not `int'
-
- #make
- ;;
-
- xiterm* )
- ## You can try to build this program,
- ## if only you have got utempter-devel.
-
- # cough cough, hack hack -- ewt
- # configure2_13 \
- # --enable-xpm-background \
- # --enable-utmp \
- # --enable-wtmp \
- # --enable-menubar \
- # --enable-next-scroll
- # xmkmf
- # make Makefiles
- # cd src
- # sed -e "s/EXTRA_LIBRARIES =/EXTRA_LIBRARIES = -lutempter/" \
- # Makefile > Makefile.foo
- # sed -e "s/-lsocket //" Makefile.foo > Makefile
- # make CXXDEBUGFLAGS="%{rpmcflags}" \
- # CDEBUGFLAGS="%{rpmcflags}"
- ;;
-
- Tasks-*)
- ## I think this program is not finished yet.
- ## There is Makefile.in but I can't find anything to
- ## create Makefile (there is no ./configure or configure.in)
- ## I think that `mv Makefile.in Makefile' will be enough.
- ## I will try this later.
- ;;
- xfascd-*)
- ## I'll try to build this program later.
- ;;
-
- asmount* | asDrinks* | asbutton* | asdm* | aspbm* | aspostit* \
- | ascdc-* | astuner* | ASFiles* | as[R-W]* | asfaces* | asmon* \
- | astrash* | asxmcd* | asampmenu* | randbg-*)
- ## We don't compile these
- ;;
-
- *)
- #just about every other thing supports autoconf
-
- %configure2_13
- make
- ;;
- esac
- cd ..
+ make CFLAGS="%{rpmcflags}"
+ ;;
+ ascp-* )
+ ## There is strange problem with this program.
+ ## The ./configure script tries to run /usr/local/bin/gtk-config
+ ## program. In PLD it should be %{_bindir}/gtk-config.
+ ##
+ ## --with-gtk-prefix
+ ## --with-gtk-exec-prefix
+ ## or --disable-gtktest
+ ## not help here. I don't now why.
+ # export LD_LIBRARY_PATH=%{_prefix}/
+ # configure2_13 \
+ # --enable-i18n \
+ # --x-includes=%{_includedir} \
+ # --x-libraries=%{_libdir} \
+ # --disable-gtktest
+ # --with-gtk-prefix=%{_prefix} \
+ # --with-gtk-exec-prefix=%{_bindir}
+ # make
+ ;;
+ asfatm-* )
+ ## <sensors/sensors.h> is needed to compile this program.
+ ## I don't have it.
+ # cd asfatm
+ # make
+ ;;
+ asppp-* )
+ ## xpminit.c:7: dial.xpm: No such file or directory
+ # configure2_13
+ # make
+ ;;
+ miniCHESS-* )
+ #chess.c: In function `mouseGame':
+ #chess.c:1667: `fd_set' undeclared (first use in this function)
+ #chess.c:1667: (Each undeclared identifier is reported only once
+ #chess.c:1667: for each function it appears in.)
+ #chess.c:1667: parse error before `fdset'
+ #chess.c:1687: `fdset' undeclared (first use in this function)
+ #chess.c: In function `main':
+ #chess.c:1975: warning: return type of `main' is not `int'
+ #make
+ ;;
+ xiterm* )
+ ## You can try to build this program,
+ ## if only you have got utempter-devel.
+ # cough cough, hack hack -- ewt
+ # configure2_13 \
+ # --enable-xpm-background \
+ # --enable-utmp \
+ # --enable-wtmp \
+ # --enable-menubar \
+ # --enable-next-scroll
+ # xmkmf
+ # make Makefiles
+ # cd src
+ # sed -e "s/EXTRA_LIBRARIES =/EXTRA_LIBRARIES = -lutempter/" \
+ # Makefile > Makefile.foo
+ # sed -e "s/-lsocket //" Makefile.foo > Makefile
+ # make CXXDEBUGFLAGS="%{rpmcflags}" \
+ # CDEBUGFLAGS="%{rpmcflags}"
+ ;;
+ Tasks-*)
+ ## I think this program is not finished yet.
+ ## There is Makefile.in but I can't find anything to
+ ## create Makefile (there is no ./configure or configure.in)
+ ## I think that `mv Makefile.in Makefile' will be enough.
+ ## I will try this later.
+ ;;
+ xfascd-*)
+ ## I'll try to build this program later.
+ ;;
+ asmount* | asDrinks* | asbutton* | asdm* | aspbm* | aspostit* \
+ | ascdc-* | astuner* | ASFiles* | as[R-W]* | asfaces* | asmon* \
+ | astrash* | asxmcd* | asampmenu* | randbg-*)
+ ## We don't compile these
+ ;;
+ *)
+ #just about every other thing supports autoconf
+ %configure2_13
+ make
+ ;;
+ esac
+ cd ..
done
%install
@@ -194,77 +177,66 @@
install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1}
for package in `ls` ; do
- cd $package
- case $package in
-
- ascd-* )
- make install install.man \
- AFTER_BIN_DIR=$RPM_BUILD_ROOT%{_bindir} \
- AFTER_MAN_DIR=$RPM_BUILD_ROOT%{_mandir}/man1 \
- MANDIR=%{_mandir}/man1 \
- BINDIR=%{_bindir} \
- SHLIBDIR=%{_libdir} \
- DESTDIR=$RPM_BUILD_ROOT
- ;;
-
- aterm*)
- ## This program is provided by aterm.rpm package.
-
- # make install \
- # AFTER_BIN_DIR=$RPM_BUILD_ROOT%{_bindir} \
- # AFTER_MAN_DIR=$RPM_BUILD_ROOT%{_mandir}/man1 \
- # DESTDIR=$RPM_BUILD_ROOT
- ;;
-
- xiterm*)
- ## You can try to install this program,
- ## if only you have got utempter-devel.
- ## Don't forget build it first.
-
-
- # make install install.man \
- # AFTER_BIN_DIR=$RPM_BUILD_ROOT%{_bindir} \
- # AFTER_MAN_DIR=$RPM_BUILD_ROOT%{_mandir}/man1 \
- # MANDIR=%{_mandir}/man1 \
- # BINDIR=%{_bindir} \
- # SHLIBDIR=%{_libdir} \
- # DESTDIR=$RPM_BUILD_ROOT
- ;;
-
- asfatm-*)
- ## We don't install this.
- ;;
-
- ascp-*)
- ## We do not install this. (If you want to know why check
- ## the build section above).
-
- # make install \
- # ASCP_BIN_DIR=$RPM_BUILD_ROOT%{_bindir} \
- # ASCP_MAN_DIR=$RPM_BUILD_ROOT%{_mandir}/man1 \
- # prefx=$RPM_BUILD_ROOT \
- # DESTDIR=$RPM_BUILD_ROOT
- ;;
-
- asppp-* | miniCHESS-* | Tasks-* | xfascd-*)
- ## There were problems with these programs in build section.
- ## We can not install it.
- ;;
- asmount* | asDrinks* | asbutton* | asdm* | aspbm* | aspostit* \
- | ascdc-* | astuner* | ASFiles* | as[R-W]* | asfaces* | asmon* \
- | astrash* | asxmcd* | asampmenu* | randbg-*)
- ## We don't install these
- ;;
-
- *)
- echo
- make install install.man \
- AFTER_BIN_DIR=$RPM_BUILD_ROOT%{_bindir} \
- AFTER_MAN_DIR=$RPM_BUILD_ROOT%{_mandir}/man1 \
- DESTDIR=$RPM_BUILD_ROOT
- ;;
- esac
- cd ..
+ cd $package
+ case $package in
+ ascd-* )
+ make install install.man \
+ AFTER_BIN_DIR=$RPM_BUILD_ROOT%{_bindir} \
+ AFTER_MAN_DIR=$RPM_BUILD_ROOT%{_mandir}/man1 \
+ MANDIR=%{_mandir}/man1 \
+ BINDIR=%{_bindir} \
+ SHLIBDIR=%{_libdir} \
+ DESTDIR=$RPM_BUILD_ROOT
+ ;;
+ aterm*)
+ ## This program is provided by aterm.rpm package.
+ # make install \
+ # AFTER_BIN_DIR=$RPM_BUILD_ROOT%{_bindir} \
+ # AFTER_MAN_DIR=$RPM_BUILD_ROOT%{_mandir}/man1 \
+ # DESTDIR=$RPM_BUILD_ROOT
+ ;;
+ xiterm*)
+ ## You can try to install this program,
+ ## if only you have got utempter-devel.
+ ## Don't forget build it first.
+ # make install install.man \
+ # AFTER_BIN_DIR=$RPM_BUILD_ROOT%{_bindir} \
+ # AFTER_MAN_DIR=$RPM_BUILD_ROOT%{_mandir}/man1 \
+ # MANDIR=%{_mandir}/man1 \
+ # BINDIR=%{_bindir} \
+ # SHLIBDIR=%{_libdir} \
+ # DESTDIR=$RPM_BUILD_ROOT
+ ;;
+ asfatm-*)
+ ## We don't install this.
+ ;;
+ ascp-*)
+ ## We do not install this. (If you want to know why check
+ ## the build section above).
+ # make install \
+ # ASCP_BIN_DIR=$RPM_BUILD_ROOT%{_bindir} \
+ # ASCP_MAN_DIR=$RPM_BUILD_ROOT%{_mandir}/man1 \
+ # prefx=$RPM_BUILD_ROOT \
+ # DESTDIR=$RPM_BUILD_ROOT
+ ;;
+ asppp-* | miniCHESS-* | Tasks-* | xfascd-*)
+ ## There were problems with these programs in build section.
+ ## We can not install it.
+ ;;
+ asmount* | asDrinks* | asbutton* | asdm* | aspbm* | aspostit* \
+ | ascdc-* | astuner* | ASFiles* | as[R-W]* | asfaces* | asmon* \
+ | astrash* | asxmcd* | asampmenu* | randbg-*)
+ ## We don't install these
+ ;;
+ *)
+ echo
+ make install install.man \
+ AFTER_BIN_DIR=$RPM_BUILD_ROOT%{_bindir} \
+ AFTER_MAN_DIR=$RPM_BUILD_ROOT%{_mandir}/man1 \
+ DESTDIR=$RPM_BUILD_ROOT
+ ;;
+ esac
+ cd ..
done
rm -f $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1}/{sessreg,xpmroot,qplot}*
@@ -288,6 +260,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.23 2006/08/12 08:26:07 ankry
+- formatting
+
Revision 1.22 2003/11/27 06:48:28 witekfl
- added home_etc.patch
================================================================
Index: SPECS/Zope3-zwiki.spec
diff -u SPECS/Zope3-zwiki.spec:1.3 SPECS/Zope3-zwiki.spec:1.4
--- SPECS/Zope3-zwiki.spec:1.3 Thu Mar 23 20:29:40 2006
+++ SPECS/Zope3-zwiki.spec Sat Aug 12 10:26:07 2006
@@ -18,8 +18,8 @@
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-%define zope_libdir /usr/lib/zope3
-%define zope_pyscriptdir /usr/share/zope3/lib/python
+%define zope_libdir /usr/lib/zope3
+%define zope_pyscriptdir /usr/share/zope3/lib/python
%description
ZWiki is a Zope product which allows you to build wiki webs in Zope.
@@ -78,6 +78,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.4 2006/08/12 08:26:07 ankry
+- formatting
+
Revision 1.3 2006/03/23 19:29:40 glen
- use %service
@@ -86,4 +89,3 @@
Revision 1.1 2005/12/20 22:24:30 arekm
- new
-
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/AfterStep-APPS.spec?r1=1.22&r2=1.23&f=u
http://cvs.pld-linux.org/SPECS/Zope3-zwiki.spec?r1=1.3&r2=1.4&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
