diff options
| author | Jonathan Blandford <jrb@src.gnome.org> | 1998-12-16 20:30:59 +0000 |
|---|---|---|
| committer | Jonathan Blandford <jrb@src.gnome.org> | 1998-12-16 20:30:59 +0000 |
| commit | 79e62200471c9e8468cb2916dda1bfb61c1b5b79 (patch) | |
| tree | 2b625010f3673a9e0f53fb941fe2ec167c7aae3c | |
| parent | de71af5c1f65de869955c4b55df0e2a2f7869c43 (diff) | |
| download | gnome-control-center-79e62200471c9e8468cb2916dda1bfb61c1b5b79.tar.gz | |
got the spec file working (i think) added it to the dist.
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | control-center.spec | 22 |
2 files changed, 7 insertions, 17 deletions
diff --git a/Makefile.am b/Makefile.am index 65639abd6..22694691c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,7 +7,7 @@ SUBDIRS = intl po macros \ #DIST_SUBDIRS = intl po macros $(always_built_SUBDIRS) -#EXTRA_DIST = control-center.spec +EXTRA_DIST = control-center.spec ## to automatically rebuild aclocal.m4 if any of the macros in `macros/' change @MAINT@include macros/macros.dep diff --git a/control-center.spec b/control-center.spec index 862c4cdbf..ca9a75167 100644 --- a/control-center.spec +++ b/control-center.spec @@ -1,5 +1,5 @@ # Note that this is NOT a relocatable package -%define ver 0.99 +%define ver 0.99.0 %define rel 1 %define prefix /usr @@ -14,9 +14,8 @@ BuildRoot: /var/tmp/control-center-root Obsoletes: gnome Packager: Jonathan Blandford <jrb@redhat.com> URL: http://www.gnome.org -Prereq: /sbin/install-info Docdir: %{prefix}/doc -Requires: xscreensaver +Requires: xscreensaver >= 2.34 Requires: gnome-core >= 0.99 Requires: ORBit >= 0.3.0 @@ -28,10 +27,9 @@ name but really GNOME is a nice GUI desktop environment. It makes using your computer easy, powerful, and easy to configure. %package devel -Summary: GNOME control-center, includes +Summary: GNOME control-center includes Group: X11/Libraries -Requires: gnome-core -PreReq: /sbin/install-info +Requires: control-center %description devel Capplet development stuff @@ -47,23 +45,15 @@ Capplet development stuff %setup %build -# Needed for snapshot releases. CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%prefix -if [ "$SMP" != "" ]; then - (make "MAKE=make -k -j $SMP"; exit 0) - make -else - make -fi - %install rm -rf $RPM_BUILD_ROOT make prefix=$RPM_BUILD_ROOT%{prefix} install %clean -rm -rf $RPM_BUILD_ROOT +#rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig @@ -75,7 +65,7 @@ rm -rf $RPM_BUILD_ROOT %doc AUTHORS COPYING ChangeLog NEWS README %{prefix}/bin/* %{prefix}/lib/lib*.so.* -%{prefix}/share/control-center +%{prefix}/share/control-center/* %{prefix}/share/locale/*/*/* %files devel |