SPECS: dwg2dxf.spec, eggdrop.spec, ejabberd.spec, fedora-adminutil...

glen glen at pld-linux.org
Wed Jul 26 17:48:12 CEST 2006 

Author: glen                         Date: Wed Jul 26 15:48:12 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- remove extra unneeded slash

---- Files affected:
SPECS:
   dwg2dxf.spec (1.7 -> 1.8) , eggdrop.spec (1.99 -> 1.100) , ejabberd.spec (1.25 -> 1.26) , fedora-adminutil.spec (1.7 -> 1.8) , fedora-console.spec (1.6 -> 1.7) , fedora-directoryconsole.spec (1.2 -> 1.3) , fedora-setuputil.spec (1.7 -> 1.8) , foomatic-db.spec (1.18 -> 1.19) , glaxium.spec (1.5 -> 1.6) , gnucash.spec (1.101 -> 1.102) , hplip.spec (1.13 -> 1.14) , ipodder.spec (1.8 -> 1.9) , ircd.spec (1.84 -> 1.85) , joomla.spec (1.12 -> 1.13) , kaffeine.spec (1.35 -> 1.36) , kf.spec (1.26 -> 1.27) , kolab.spec (1.7 -> 1.8) , libsharedmime.spec (1.2 -> 1.3) , nocc.spec (1.36 -> 1.37) , pam-pam_script.spec (1.4 -> 1.5) , pam-pam_sqlite.spec (1.9 -> 1.10) 

---- Diffs:

================================================================
Index: SPECS/dwg2dxf.spec
diff -u SPECS/dwg2dxf.spec:1.7 SPECS/dwg2dxf.spec:1.8
--- SPECS/dwg2dxf.spec:1.7	Fri Jun 17 23:58:48 2005
+++ SPECS/dwg2dxf.spec	Wed Jul 26 17:48:06 2006
@@ -43,7 +43,7 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-install %{name}/adinit.dat $RPM_BUILD_ROOT/%{_datadir}/%{name}
+install %{name}/adinit.dat $RPM_BUILD_ROOT%{_datadir}/%{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -60,6 +60,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.8  2006/07/26 15:48:06  glen
+- remove extra unneeded slash
+
 Revision 1.7  2005/06/17 21:58:48  qboosh
 - unified "AutoCAD" caps
 

================================================================
Index: SPECS/eggdrop.spec
diff -u SPECS/eggdrop.spec:1.99 SPECS/eggdrop.spec:1.100
--- SPECS/eggdrop.spec:1.99	Fri May 26 00:16:44 2006
+++ SPECS/eggdrop.spec	Wed Jul 26 17:48:06 2006
@@ -180,10 +180,10 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-mv $RPM_BUILD_ROOT/%{name}-%{version} $RPM_BUILD_ROOT%{_bindir}/%{name}
+mv $RPM_BUILD_ROOT%{name}-%{version} $RPM_BUILD_ROOT%{_bindir}/%{name}
 mv -f $RPM_BUILD_ROOT{/{text/*,help,scripts,language},%{_datadir}/%{name}/}
 mv -f $RPM_BUILD_ROOT/modules/* $RPM_BUILD_ROOT%{_libdir}/%{name}/modules/
-mv -f $RPM_BUILD_ROOT{/doc,%{_mandir}}/man1/%{name}.1 
+mv -f $RPM_BUILD_ROOT{/doc,%{_mandir}}/man1/%{name}.1
 rm -rf $RPM_BUILD_ROOT/{doc,README,logs,eggdrop.conf}
 
 rm -rf docs
@@ -209,6 +209,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.100  2006/07/26 15:48:06  glen
+- remove extra unneeded slash
+
 Revision 1.99  2006/05/25 22:16:44  glen
 - just -l ru
 

================================================================
Index: SPECS/ejabberd.spec
diff -u SPECS/ejabberd.spec:1.25 SPECS/ejabberd.spec:1.26
--- SPECS/ejabberd.spec:1.25	Mon May 15 22:34:43 2006
+++ SPECS/ejabberd.spec	Wed Jul 26 17:48:06 2006
@@ -64,8 +64,8 @@
 sed -e's, at libdir@,%{_libdir},g' %{SOURCE1} > $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/%{name}
 
-sed -e's, at libdir@,%{_libdir},g' %{SOURCE3} > $RPM_BUILD_ROOT/%{_sbindir}/%{name}
-sed -e's, at libdir@,%{_libdir},g' %{SOURCE4} > $RPM_BUILD_ROOT/%{_sbindir}/%{name}ctl
+sed -e's, at libdir@,%{_libdir},g' %{SOURCE3} > $RPM_BUILD_ROOT%{_sbindir}/%{name}
+sed -e's, at libdir@,%{_libdir},g' %{SOURCE4} > $RPM_BUILD_ROOT%{_sbindir}/%{name}ctl
 install %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/jabber
 
 %clean
@@ -113,6 +113,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.26  2006/07/26 15:48:06  glen
+- remove extra unneeded slash
+
 Revision 1.25  2006/05/15 20:34:43  psz
 - added missing BR
 

================================================================
Index: SPECS/fedora-adminutil.spec
diff -u SPECS/fedora-adminutil.spec:1.7 SPECS/fedora-adminutil.spec:1.8
--- SPECS/fedora-adminutil.spec:1.7	Wed May 10 21:45:31 2006
+++ SPECS/fedora-adminutil.spec	Wed Jul 26 17:48:06 2006
@@ -44,8 +44,8 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_includedir}/{libadminutil,libadmsslutil},%{_libdir}}
-install built/adminutil/*/include/libadminutil/* $RPM_BUILD_ROOT/%{_includedir}/libadminutil
-install built/adminutil/*/include/libadmsslutil/* $RPM_BUILD_ROOT/%{_includedir}/libadmsslutil
+install built/adminutil/*/include/libadminutil/* $RPM_BUILD_ROOT%{_includedir}/libadminutil
+install built/adminutil/*/include/libadmsslutil/* $RPM_BUILD_ROOT%{_includedir}/libadmsslutil
 install built/adminutil/*/lib/lib* $RPM_BUILD_ROOT%{_libdir}
 
 %clean
@@ -63,6 +63,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.8  2006/07/26 15:48:06  glen
+- remove extra unneeded slash
+
 Revision 1.7  2006/05/10 19:45:31  qboosh
 - pl, quote __make
 

================================================================
Index: SPECS/fedora-console.spec
diff -u SPECS/fedora-console.spec:1.6 SPECS/fedora-console.spec:1.7
--- SPECS/fedora-console.spec:1.6	Fri May 19 13:28:19 2006
+++ SPECS/fedora-console.spec	Wed Jul 26 17:48:06 2006
@@ -38,7 +38,7 @@
 install -d $RPM_BUILD_ROOT%{_datadir}/%{name}
 install ../built/release/jars/fedora-* $RPM_BUILD_ROOT%{_datadir}/%{name}
 install -d $RPM_BUILD_ROOT%{_bindir}
-install startconsole $RPM_BUILD_ROOT/%{_bindir}
+install startconsole $RPM_BUILD_ROOT%{_bindir}
 
 cd $RPM_BUILD_ROOT%{_datadir}/%{name}
 ln -s fedora-base-1.0.jar fedora-base-%{version}.jar
@@ -71,6 +71,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.7  2006/07/26 15:48:06  glen
+- remove extra unneeded slash
+
 Revision 1.6  2006/05/19 11:28:19  jajcus
 - s/jakarta-ant/ant/ in BR
 

================================================================
Index: SPECS/fedora-directoryconsole.spec
diff -u SPECS/fedora-directoryconsole.spec:1.2 SPECS/fedora-directoryconsole.spec:1.3
--- SPECS/fedora-directoryconsole.spec:1.2	Wed May 10 22:05:15 2006
+++ SPECS/fedora-directoryconsole.spec	Wed Jul 26 17:48:06 2006
@@ -11,12 +11,14 @@
 # Source0-md5:	7d4229a06ad466c67ae5c7877ec09599
 URL:		http://directory.fedora.redhat.com/wiki/Client_software
 BuildRequires:	mozldap-devel
-BuildRequires:	nss-devel
 BuildRequires:	nspr-devel >= 4.4.1
+BuildRequires:	nss-devel
 BuildRequires:	rpmbuild(macros) >= 1.228
 #build requires Mozilla NSS, NSPR, JSS, and LDAP JDK
-#Requires: ldapjdk >= 4.17, jss >= 3.6
-#BuildRequires:	ldapjdk >= 4.17, jss >= 3.6
+#BuildRequires:	jss >= 3.6
+#BuildRequires:	ldapsdk >= 4.17
+#Requires:	jss >= 3.6
+#Requires:	ldapjdk >= 4.17
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -59,7 +61,7 @@
 #install -d $RPM_BUILD_ROOT%{_datadir}/%{name}
 #install built/release/jars/fedora-* $RPM_BUILD_ROOT%{_datadir}/%{name}
 #install -d $RPM_BUILD_ROOT%{_bindir}
-#install console/startconsole $RPM_BUILD_ROOT/%{_bindir}
+#install console/startconsole $RPM_BUILD_ROOT%{_bindir}
 
 #cd $RPM_BUILD_ROOT%{_datadir}/%{name}
 #ln -s fedora-base-%{version}.jar fedora-base.jar
@@ -93,6 +95,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2006/07/26 15:48:06  glen
+- remove extra unneeded slash
+
 Revision 1.2  2006/05/10 20:05:15  qboosh
 - pl
 

================================================================
Index: SPECS/fedora-setuputil.spec
diff -u SPECS/fedora-setuputil.spec:1.7 SPECS/fedora-setuputil.spec:1.8
--- SPECS/fedora-setuputil.spec:1.7	Wed May 10 22:09:06 2006
+++ SPECS/fedora-setuputil.spec	Wed Jul 26 17:48:06 2006
@@ -13,8 +13,8 @@
 Source0:	http://directory.fedora.redhat.com/sources/%{name}-%{version}.tar.gz
 # Source0-md5:	6bc26ba2edee75c3c8d5bf9a21bda7b8
 URL:		http://directory.fedora.redhat.com/wiki/SetupUtil
-BuildRequires:	libtermcap-devel
 BuildRequires:	libstdc++-devel
+BuildRequires:	libtermcap-devel
 BuildRequires:	mozldap-static
 BuildRequires:	ncurses-devel
 #BuildRequires:	svrcore-devel
@@ -45,7 +45,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_includedir},%{_libdir}}
-install built/package/*/include/* $RPM_BUILD_ROOT/%{_includedir}
+install built/package/*/include/* $RPM_BUILD_ROOT%{_includedir}
 install built/package/*/lib/* $RPM_BUILD_ROOT%{_libdir}
 
 %clean
@@ -62,6 +62,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.8  2006/07/26 15:48:06  glen
+- remove extra unneeded slash
+
 Revision 1.7  2006/05/10 20:09:06  qboosh
 - pl
 

================================================================
Index: SPECS/foomatic-db.spec
diff -u SPECS/foomatic-db.spec:1.18 SPECS/foomatic-db.spec:1.19
--- SPECS/foomatic-db.spec:1.18	Fri Dec  2 20:34:42 2005
+++ SPECS/foomatic-db.spec	Wed Jul 26 17:48:06 2006
@@ -42,7 +42,7 @@
 	DESTDIR=$RPM_BUILD_ROOT
 
 # We don't need PPD files in this package
-rm $RPM_BUILD_ROOT/%{_datadir}/foomatic/db/source/PPD/ -frd
+rm $RPM_BUILD_ROOT%{_datadir}/foomatic/db/source/PPD/ -frd
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -60,6 +60,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.19  2006/07/26 15:48:06  glen
+- remove extra unneeded slash
+
 Revision 1.18  2005/12/02 19:34:42  blekot
 - We don't need PPD files in this package
 - rel 1

================================================================
Index: SPECS/glaxium.spec
diff -u SPECS/glaxium.spec:1.5 SPECS/glaxium.spec:1.6
--- SPECS/glaxium.spec:1.5	Wed Jun  1 16:01:57 2005
+++ SPECS/glaxium.spec	Wed Jul 26 17:48:06 2006
@@ -9,9 +9,9 @@
 Source0:	http://xhosxe.free.fr/glaxium/%{name}_%{version}.tar.gz
 # Source0-md5:	ea6d6f8b4ebb7c73b74af64d83f45cb7
 URL:		http://xhosxe.free.fr/glaxium
+BuildRequires:	OpenGL-devel
 BuildRequires:	SDL-devel
 BuildRequires:	SDL_mixer-devel
-BuildRequires:	OpenGL-devel
 BuildRequires:	gcc-c++
 BuildRequires:	glut-devel
 BuildRequires:	libpng-devel
@@ -42,7 +42,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT/%{_bindir}
+install -d $RPM_BUILD_ROOT%{_bindir}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
@@ -63,6 +63,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2006/07/26 15:48:06  glen
+- remove extra unneeded slash
+
 Revision 1.5  2005/06/01 14:01:57  zbyniu
 - BR: gcc-c++, libpng-devel
 

================================================================
Index: SPECS/gnucash.spec
diff -u SPECS/gnucash.spec:1.101 SPECS/gnucash.spec:1.102
--- SPECS/gnucash.spec:1.101	Wed Jul 12 16:36:14 2006
+++ SPECS/gnucash.spec	Wed Jul 26 17:48:06 2006
@@ -27,13 +27,13 @@
 BuildRequires:	guile-devel >= 5:1.6
 BuildRequires:	guile-www
 BuildRequires:	ktoblzcheck-devel
-BuildRequires:	libltdl-devel
 BuildRequires:	libglade2-devel >= 2.4
 BuildRequires:	libgnomeprint-devel >= 2.2
 BuildRequires:	libgnomeprintui-devel >= 2.2
 BuildRequires:	libgnomeui-devel >= 2.4
 BuildRequires:	libgoffice-devel >= 0.0.4
 BuildRequires:	libgsf-gnome-devel >= 1.12.2
+BuildRequires:	libltdl-devel
 BuildRequires:	libofx-devel >= 0.7.0
 BuildRequires:	libxml2-devel >= 1:2.5.10
 BuildRequires:	pango-devel >= 1.8.0
@@ -109,7 +109,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/%{_pixmapsdir}
+install -d $RPM_BUILD_ROOT%{_pixmapsdir}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
@@ -455,6 +455,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.102  2006/07/26 15:48:06  glen
+- remove extra unneeded slash
+
 Revision 1.101  2006/07/12 14:36:14  jajcus
 - BR: libltdl-devel
 

================================================================
Index: SPECS/hplip.spec
diff -u SPECS/hplip.spec:1.13 SPECS/hplip.spec:1.14
--- SPECS/hplip.spec:1.13	Wed Jun  7 11:05:36 2006
+++ SPECS/hplip.spec	Wed Jul 26 17:48:06 2006
@@ -27,7 +27,7 @@
 BuildRequires:	net-snmp-devel
 BuildRequires:	openssl-devel
 BuildRequires:	python-devel
-BuildRequires:  sane-backends-devel
+BuildRequires:	sane-backends-devel
 Requires:	%{name}-libs = %{version}-%{release}
 Obsoletes:	hpijs
 Obsoletes:	python-hplip
@@ -63,9 +63,9 @@
 Summary:	HPLIP SANE Libraries
 Summary(pl):	Biblioteki HPLIP SANE
 Group:		Libraries
-Requires:	%{name} = %{version}-%{release}
 Requires(post):	/bin/grep
-Requires(postun): /bin/sed
+Requires(postun):	/bin/sed
+Requires:	%{name} = %{version}-%{release}
 
 %description sane
 HPLIP SANE Libraries.
@@ -89,8 +89,8 @@
 Summary:	HP backend for CUPS
 Summary(pl):	Backend HP dla CUPS-a
 Group:		Applications/Printing
-Requires:	cups
 Requires:	%{name} = %{version}-%{release}
+Requires:	cups
 
 %description -n cups-backend-hp
 This package allow CUPS printing on HP printers.
@@ -134,19 +134,19 @@
 mv $RPM_BUILD_ROOT{%{_datadir}/ppd/HP/*,%{_cupsppddir}}
 %endif
 
-ln -sf %{_datadir}/%{name}/hpssd.py $RPM_BUILD_ROOT/%{_sbindir}/hpssd
-ln -sf %{_datadir}/%{name}/setup $RPM_BUILD_ROOT/%{_sbindir}/hp-setup
+ln -sf %{_datadir}/%{name}/hpssd.py $RPM_BUILD_ROOT%{_sbindir}/hpssd
+ln -sf %{_datadir}/%{name}/setup $RPM_BUILD_ROOT%{_sbindir}/hp-setup
 
 for tool in align clean colorcal fab info levels makeuri photo print \
 		sendfax testpage toolbox unload ; do
-	ln -sf %{_datadir}/%{name}/$tool $RPM_BUILD_ROOT/%{_bindir}/hp-$tool
+	ln -sf %{_datadir}/%{name}/$tool $RPM_BUILD_ROOT%{_bindir}/hp-$tool
 done
 
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/hplip
 
 mv $RPM_BUILD_ROOT{%{_datadir}/%{name}/%{name}.conf,%{_sysconfdir}/hp}
-rm -rf $RPM_BUILD_ROOT{%{_bindir}/foomatic-rip,%{_libdir}/*.la,/usr/share/doc/hpijs*} \
-	$RPM_BUILD_ROOT{%{_datadir}/%{name}/hplip{,.sh},/etc/sane.d/*}
+rm -rf $RPM_BUILD_ROOT{%{_bindir}/foomatic-rip,%{_libdir}/*.la,%{_docdir}/hpijs*} \
+	$RPM_BUILD_ROOT{%{_datadir}/%{name}/hplip{,.sh},%{_sysconfdir}/sane.d/*}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -157,7 +157,7 @@
 %post sane
 /bin/grep -q '^hpaio' /etc/sane.d/dll.conf || echo hpaio >> /etc/sane.d/dll.conf
 
-%postun sane 
+%postun sane
 if [ "$1" = "0" ]; then
 	/bin/sed -e'/^hpaio/d' -i /etc/sane.d/dll.conf || :
 fi
@@ -230,6 +230,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.14  2006/07/26 15:48:06  glen
+- remove extra unneeded slash
+
 Revision 1.13  2006/06/07 09:05:36  jajcus
 - Release: 1
 - python modules included in the main package (they are required by most of the tools)

================================================================
Index: SPECS/ipodder.spec
diff -u SPECS/ipodder.spec:1.8 SPECS/ipodder.spec:1.9
--- SPECS/ipodder.spec:1.8	Sat Sep 24 16:21:50 2005
+++ SPECS/ipodder.spec	Wed Jul 26 17:48:06 2006
@@ -12,9 +12,9 @@
 Patch0:		%{name}-fixes.patch
 URL:		http://ipodder.sourceforge.net/
 Requires:	python-libxml2
+Requires:	python-modules
 Requires:	python-wxPython
 Requires:	python-xmms
-Requires:	python-modules
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -65,7 +65,7 @@
 rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/*.linux
 rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/LICENSE
 
-cat << EOF > $RPM_BUILD_ROOT/%{_bindir}/%{name}
+cat << EOF > $RPM_BUILD_ROOT%{_bindir}/%{name}
 #!/bin/sh
 cd %{_datadir}/%{name}
 exec %{_bindir}/python iPodderGui.py
@@ -87,6 +87,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.9  2006/07/26 15:48:06  glen
+- remove extra unneeded slash
+
 Revision 1.8  2005/09/24 14:21:50  glen
 - updated to 2.1.9
 

================================================================
Index: SPECS/ircd.spec
diff -u SPECS/ircd.spec:1.84 SPECS/ircd.spec:1.85
--- SPECS/ircd.spec:1.84	Fri Apr 14 17:07:36 2006
+++ SPECS/ircd.spec	Wed Jul 26 17:48:06 2006
@@ -26,7 +26,6 @@
 BuildRequires:	automake
 BuildRequires:	ncurses-devel
 BuildRequires:	rpmbuild(macros) >= 1.268
-BuildRequires:	textutils
 BuildRequires:	zlib-devel
 Requires(post):	fileutils
 Requires(post,preun):	/sbin/chkconfig
@@ -120,7 +119,7 @@
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/%{name}
 install %{SOURCE3} $RPM_BUILD_ROOT/etc/logrotate.d/%{name}
-install %{SOURCE4} $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}.conf
+install %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.conf
 
 rm -f $RPM_BUILD_ROOT%{_sysconfdir}/{iauth,ircd}.conf.example
 touch $RPM_BUILD_ROOT%{_localstatedir}/ircd.{pid,tune}
@@ -188,6 +187,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.85  2006/07/26 15:48:06  glen
+- remove extra unneeded slash
+
 Revision 1.84  2006/04/14 15:07:36  glen
 - rel 2
 

================================================================
Index: SPECS/joomla.spec
diff -u SPECS/joomla.spec:1.12 SPECS/joomla.spec:1.13
--- SPECS/joomla.spec:1.12	Wed Jul  5 12:09:41 2006
+++ SPECS/joomla.spec	Wed Jul 26 17:48:06 2006
@@ -1,4 +1,6 @@
 # $Revision$, $Date$
+# TODO
+# - webapps
 Summary:	Content management system
 Summary(pl):	System zarządzania treścią
 Name:		joomla
@@ -16,12 +18,12 @@
 Patch0:		%{name}-config.patch
 Patch1:		%{name}-install.patch
 URL:		http://www.joomla.org/
+Requires:	apache >= 2.0
 Requires:	php
 Requires:	php-gd
 Requires:	php-mysql
 Requires:	php-pcre
 Requires:	php-session
-Requires:	apache >= 2.0
 Requires:	webapps
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -35,14 +37,14 @@
 %description
 Joomla! is one of the most powerful Open Source Content Management
 Systems on the planet. It is used all over the world for everything
-from simple websites to complex corporate applications.
-Joomla! is easy to install, simple to manage, and reliable. 
+from simple websites to complex corporate applications. Joomla! is
+easy to install, simple to manage, and reliable.
 
 %description -l pl
 Joomla! to jeden z najpotężniejszych systemów zarządzania treścią z
 otwartymi źródłami. Jest używana na całym świecie do wszystkiego od
-prostych stron WWW do złożonych aplikacji korporacyjnych. Joomla!
-jest łatwa w instalacji, prosta w zarządzaniu i niezawodna.
+prostych stron WWW do złożonych aplikacji korporacyjnych. Joomla! jest
+łatwa w instalacji, prosta w zarządzaniu i niezawodna.
 
 %prep
 %setup -q -c
@@ -70,7 +72,7 @@
 	$RPM_BUILD_ROOT%{_joomladir}/configuration.php-dist > $RPM_BUILD_ROOT%{_sysconfdir}/configuration.php
 ln -sf %{_sysconfdir}/configuration.php $RPM_BUILD_ROOT%{_joomladir}/configuration.php
 
-install %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/httpd.conf
+install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -98,6 +100,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.13  2006/07/26 15:48:06  glen
+- remove extra unneeded slash
+
 Revision 1.12  2006/07/05 10:09:41  pawcioos
 - fixed missing pl language
 

================================================================
Index: SPECS/kaffeine.spec
diff -u SPECS/kaffeine.spec:1.35 SPECS/kaffeine.spec:1.36
--- SPECS/kaffeine.spec:1.35	Mon Jun  5 13:47:27 2006
+++ SPECS/kaffeine.spec	Wed Jul 26 17:48:06 2006
@@ -67,7 +67,7 @@
 rm -r $RPM_BUILD_ROOT%{_includedir}/%{name}
 rm $RPM_BUILD_ROOT%{_includedir}/%{name}_export.h
 
-rm $RPM_BUILD_ROOT/%{_datadir}/mimelnk/application/x-mplayer2.desktop
+rm $RPM_BUILD_ROOT%{_datadir}/mimelnk/application/x-mplayer2.desktop
 
 # pick docs
 %find_lang %{name} --with-kde
@@ -123,6 +123,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.36  2006/07/26 15:48:06  glen
+- remove extra unneeded slash
+
 Revision 1.35  2006/06/05 11:47:27  qboosh
 - use gstreamer08x name in R
 

================================================================
Index: SPECS/kf.spec
diff -u SPECS/kf.spec:1.26 SPECS/kf.spec:1.27
--- SPECS/kf.spec:1.26	Wed Apr 27 22:24:05 2005
+++ SPECS/kf.spec	Wed Jul 26 17:48:06 2006
@@ -41,9 +41,9 @@
 
 %build
 export LDFLAGS="$LDFLAGS -export-dynamic -g"
-glib-gettextize --copy --force
+%{__glib_gettextize}
 %{__libtoolize}
-intltoolize --copy --force
+%{__intltoolize}
 %{__aclocal}
 %{__autoconf}
 %{__automake}
@@ -61,7 +61,7 @@
 	DESTDIR=$RPM_BUILD_ROOT
 
 install data/%{name}.png $RPM_BUILD_ROOT%{_pixmapsdir}
-mv $RPM_BUILD_ROOT/%{_bindir}/%{name} $RPM_BUILD_ROOT/%{_bindir}/%{name}isha
+mv $RPM_BUILD_ROOT%{_bindir}/%{name} $RPM_BUILD_ROOT/%{_bindir}/%{name}isha
 
 rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/*.h
 
@@ -84,6 +84,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.27  2006/07/26 15:48:06  glen
+- remove extra unneeded slash
+
 Revision 1.26  2005/04/27 20:24:05  paszczus
 - updated to 0.5.4.1
 

================================================================
Index: SPECS/kolab.spec
diff -u SPECS/kolab.spec:1.7 SPECS/kolab.spec:1.8
--- SPECS/kolab.spec:1.7	Sun Nov 27 23:18:31 2005
+++ SPECS/kolab.spec	Wed Jul 26 17:48:06 2006
@@ -19,15 +19,15 @@
 URL:		http://www.kolab.org/
 BuildRequires:	%{_bindir}/rpm2cpio
 BuildRequires:	shtool
-Requires:	webserver = apache
 Requires:	apache(mod_dav)
 Requires:	apache(mod_dir)
-Requires:	cyrus-sasl
 Requires:	cyrus-imapd
+Requires:	cyrus-sasl
 Requires:	openldap
 Requires:	perl-ldap
 Requires:	postfix
 Requires:	proftpd
+Requires:	webserver = apache
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_sysconfdir	/etc/kolab
@@ -105,8 +105,8 @@
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/dwg2dxf.spec?r1=1.7&r2=1.8&f=u
    http://cvs.pld-linux.org/SPECS/eggdrop.spec?r1=1.99&r2=1.100&f=u
    http://cvs.pld-linux.org/SPECS/ejabberd.spec?r1=1.25&r2=1.26&f=u
    http://cvs.pld-linux.org/SPECS/fedora-adminutil.spec?r1=1.7&r2=1.8&f=u
    http://cvs.pld-linux.org/SPECS/fedora-console.spec?r1=1.6&r2=1.7&f=u
    http://cvs.pld-linux.org/SPECS/fedora-directoryconsole.spec?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/SPECS/fedora-setuputil.spec?r1=1.7&r2=1.8&f=u
    http://cvs.pld-linux.org/SPECS/foomatic-db.spec?r1=1.18&r2=1.19&f=u
    http://cvs.pld-linux.org/SPECS/glaxium.spec?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/SPECS/gnucash.spec?r1=1.101&r2=1.102&f=u
    http://cvs.pld-linux.org/SPECS/hplip.spec?r1=1.13&r2=1.14&f=u
    http://cvs.pld-linux.org/SPECS/ipodder.spec?r1=1.8&r2=1.9&f=u
    http://cvs.pld-linux.org/SPECS/ircd.spec?r1=1.84&r2=1.85&f=u
    http://cvs.pld-linux.org/SPECS/joomla.spec?r1=1.12&r2=1.13&f=u
    http://cvs.pld-linux.org/SPECS/kaffeine.spec?r1=1.35&r2=1.36&f=u
    http://cvs.pld-linux.org/SPECS/kf.spec?r1=1.26&r2=1.27&f=u
    http://cvs.pld-linux.org/SPECS/kolab.spec?r1=1.7&r2=1.8&f=u
    http://cvs.pld-linux.org/SPECS/libsharedmime.spec?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/SPECS/nocc.spec?r1=1.36&r2=1.37&f=u
    http://cvs.pld-linux.org/SPECS/pam-pam_script.spec?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/SPECS/pam-pam_sqlite.spec?r1=1.9&r2=1.10&f=u

More information about the pld-cvs-commit mailing list