Author: glen Date: Wed May 3 16:07:46 2006 GMT Module: SPECS Tag: HEAD ---- Log message: - junk cleanup
---- Files affected: SPECS: fedora-adminserver.spec (1.1 -> 1.2) , fedora-console.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/fedora-adminserver.spec diff -u SPECS/fedora-adminserver.spec:1.1 SPECS/fedora-adminserver.spec:1.2 --- SPECS/fedora-adminserver.spec:1.1 Wed May 3 17:35:48 2006 +++ SPECS/fedora-adminserver.spec Wed May 3 18:07:41 2006 @@ -1,6 +1,5 @@ # $Revision$, $Date$ Summary: Fedora Admin Server -Summary(pl): - Name: fedora-adminserver Version: 1.0.2 Release: 0.1 @@ -10,23 +9,22 @@ # Source0-md5: ab7b4809b135e28f114c8367264e9394 URL: http://directory.fedora.redhat.com/wiki/AdminServer #BuildRequires: apr-devel +BuildRequires: cyrus-sasl-devel BuildRequires: db-devel >= 4.0 -BuildRequires: libicu-devel -BuildRequires: libstdc++-devel -BuildRequires: libtermcap-devel -BuildRequires: nspr-devel >= 4.4.1 -BuildRequires: rpmbuild(macros) >= 1.228 #BuildRequires: fedora-adminutil #BuildRequires: fedora-setuputil -BuildRequires: cyrus-sasl-devel BuildRequires: gdbm-devel >= 1.6 +BuildRequires: libicu-devel +BuildRequires: libstdc++-devel +BuildRequires: libtermcap-devel BuildRequires: mozldap-devel BuildRequires: net-snmp-devel >= 5.2.1 +BuildRequires: nspr-devel >= 4.4.1 BuildRequires: nss-devel +BuildRequires: rpmbuild(macros) >= 1.228 #BuildRequires: which #BuildRequires: zip #Requires: libicu >= 2.4 - BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -43,9 +41,6 @@ Support for starting up servers on low port numbers is provided by mod_restartd -%description -l pl -- - %prep %setup -q @@ -56,16 +51,13 @@ MAKE=%{__make} \ %install - rm -rf $RPM_BUILD_ROOT + %clean rm -rf $RPM_BUILD_ROOT %files %defattr(644,root,root,755) -#%doc AUTHORS CREDITS ChangeLog NEWS README THANKS TODO -#%{_datadir}/%{name}/fedora-base-%{version}.jar -#%{_bindir}/startconsole %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -73,8 +65,8 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.2 2006/05/03 16:07:41 glen +- junk cleanup + Revision 1.1 2006/05/03 15:35:48 wolvverine - init - - - ================================================================ Index: SPECS/fedora-console.spec diff -u SPECS/fedora-console.spec:1.1 SPECS/fedora-console.spec:1.2 --- SPECS/fedora-console.spec:1.1 Wed May 3 16:09:49 2006 +++ SPECS/fedora-console.spec Wed May 3 18:07:41 2006 @@ -1,6 +1,5 @@ # $Revision$, $Date$ Summary: Fedora DS Java Remote Management Console -Summary(pl): - Name: fedora-console Version: 1.0.2 Release: 0.1 @@ -9,17 +8,16 @@ Source0: http://directory.fedora.redhat.com/sources/%{name}-%{version}.tar.gz # Source0-md5: cc2ccdf7a0f0a1ce78326251105a12f9 URL: http://directory.fedora.redhat.com/wiki/Client_software -#Requires: ldapjdk >= 4.17, jss >= 3.6 -#BuildRequires: ldapjdk >= 4.17, jss >= 3.6 +#BuildRequires: jss >= 3.6 +#BuildRequires: ldapjdk >= 4.17 +#Requires: jss >= 3.6 +#Requires: ldapjdk >= 4.17 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description A Java based remote management console used for Managing Fedora Administration Server and Fedora Directory Server. -%description -l pl -- - %prep %setup -q @@ -30,7 +28,7 @@ rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT%{_datadir}/%{name} install built/release/jars/fedora-* $RPM_BUILD_ROOT%{_datadir}/%{name} -install -d $RPM_BUILD_ROOT/usr/bin +install -d $RPM_BUILD_ROOT%{_bindir} install console/startconsole $RPM_BUILD_ROOT/%{_bindir} cd $RPM_BUILD_ROOT%{_datadir}/%{name} @@ -45,7 +43,6 @@ %files %defattr(644,root,root,755) -#%doc AUTHORS CREDITS ChangeLog NEWS README THANKS TODO %{_datadir}/%{name}/fedora-base-%{version}.jar %{_datadir}/%{name}/fedora-mcc-%{version}.jar %{_datadir}/%{name}/fedora-mcc-%{version}_en.jar @@ -56,7 +53,7 @@ %{_datadir}/%{name}/fedora-mcc_en.jar %{_datadir}/%{name}/fedora-nmclf.jar %{_datadir}/%{name}/fedora-nmclf_en.jar -%{_bindir}/startconsole +%attr(755,root,root) %{_bindir}/startconsole %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -64,7 +61,8 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.2 2006/05/03 16:07:41 glen +- junk cleanup + Revision 1.1 2006/05/03 14:09:49 wolvverine - init, needed look at java specialist ;) - - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/fedora-adminserver.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/fedora-console.spec?r1=1.1&r2=1.2&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit