SPECS: krpmbuilder.spec - missing dirs - fix build on amd64 - use ...

glen glen at pld-linux.org
Tue May 9 20:32:15 CEST 2006


Author: glen                         Date: Tue May  9 18:32:15 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- missing dirs
- fix build on amd64
- use make var instead of moving files

---- Files affected:
SPECS:
   krpmbuilder.spec (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SPECS/krpmbuilder.spec
diff -u SPECS/krpmbuilder.spec:1.1 SPECS/krpmbuilder.spec:1.2
--- SPECS/krpmbuilder.spec:1.1	Tue May  9 11:03:41 2006
+++ SPECS/krpmbuilder.spec	Tue May  9 20:32:10 2006
@@ -2,15 +2,17 @@
 Summary:	KRPMBuilder makes the building of spec files and RPM packages easy
 Name:		krpmbuilder
 Version:	1.2
-Release:	0.1
+Release:	0.2
 License:	GPL v2
 Group:		Applications
 Source0:	http://dl.sourceforge.net/krpmbuilder/%{name}-%{version}.tar.gz
 # Source0-md5:	99b84803171d64f1347617b5facd3851
 URL:		http://krpmbuilder.sourceforge.net/
+BuildRequires:	autoconf
+BuildRequires:	automake
 BuildRequires:	libpng-devel
 Buildrequires:	qt-devel
-#Requires:	-
+BuildRequires:	kdelibs-devel >= 9:3.2.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -23,19 +25,22 @@
 %setup -q
 
 %build
-%configure
+cp -f /usr/share/automake/config.sub admin
+%configure \
+%if "%{_lib}" == "lib64"
+	--enable-libsuffix=64 \
+%endif
+	--%{?debug:en}%{!?debug:dis}able-debug%{?debug:=full} \
+	--with-qt-libraries=%{_libdir}
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
+	appdir=%{_desktopdir} \
 	DESTDIR=$RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT%{_desktopdir}
-mv $RPM_BUILD_ROOT%{_datadir}/applnk/Development/krpmbuilder.desktop $RPM_BUILD_ROOT%{_desktopdir}
-
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -45,7 +50,7 @@
 %attr(755,root,root) %{_bindir}/*
 %{_desktopdir}/%{name}.desktop
 %{_iconsdir}/*/*x*/apps/%{name}.png
-%{_datadir}/apps/krpmbuilder/pics/*.png
+%{_datadir}/apps/krpmbuilder
 
 %define date    %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -53,7 +58,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2006/05/09 18:32:10  glen
+- missing dirs
+- fix build on amd64
+- use make var instead of moving files
+
 Revision 1.1  2006/05/09 09:03:41  spider
 - init
 - NFY
-
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/krpmbuilder.spec?r1=1.1&r2=1.2&f=u



More information about the pld-cvs-commit mailing list