SPECS: ksambaplugin.spec - fixed PIC issue at its source
qboosh
qboosh at pld-linux.org
Sat Jan 5 01:43:42 CET 2008
Author: qboosh Date: Sat Jan 5 00:43:42 2008 GMT
Module: SPECS Tag: HEAD
---- Log message:
- fixed PIC issue at its source
---- Files affected:
SPECS:
ksambaplugin.spec (1.13 -> 1.14)
---- Diffs:
================================================================
Index: SPECS/ksambaplugin.spec
diff -u SPECS/ksambaplugin.spec:1.13 SPECS/ksambaplugin.spec:1.14
--- SPECS/ksambaplugin.spec:1.13 Sat Apr 7 19:27:03 2007
+++ SPECS/ksambaplugin.spec Sat Jan 5 01:43:37 2008
@@ -13,6 +13,7 @@
BuildRequires: fam-devel
BuildRequires: kdelibs-devel >= 3.0
BuildRequires: rpmbuild(macros) >= 1.129
+BuildRequires: sed >= 4.0
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -32,14 +33,14 @@
%prep
%setup -q
%patch0 -p1
-mv %{name}-%{version} shit
-mv shit/* .
-rm -rf shit
+mv %{name}-%{version}/* .
+rmdir %{name}-%{version}
+
+# -Wmissing-prototypes is not a valid g++ option, breaks detection of another options
+sed -i -e 's/\(CXXFLAGS=.*\) -Wmissing-prototypes/\1/' configure
%build
kde_htmldir="%{_kdedocdir}"; export kde_htmldir
-# -fPIC is missing somewhere in build system
-export CXXFLAGS="-fPIC %{rpmcxxflags}"
%configure
%{__make}
@@ -49,10 +50,8 @@
install -d $RPM_BUILD_ROOT%{_desktopdir}
%{__make} install \
- DESTDIR=$RPM_BUILD_ROOT
-
-mv -f $RPM_BUILD_ROOT%{_datadir}/applnk/Settings/Network/*.desktop \
- $RPM_BUILD_ROOT%{_desktopdir}
+ DESTDIR=$RPM_BUILD_ROOT \
+ mydatadir=%{_desktopdir}/kde
%clean
rm -rf $RPM_BUILD_ROOT
@@ -64,8 +63,8 @@
%{_libdir}/kde3/libkcm_kcmsambaconf.la
%attr(755,root,root) %{_libdir}/kde3/libkcm_kcmsambaconf.so
%{_datadir}/services/ksambakonqiplugin.desktop
-%{_desktopdir}/kcmsambaconf.desktop
-%{_iconsdir}/*/*/*/kcmsambaconf.png
+%{_desktopdir}/kde/kcmsambaconf.desktop
+%{_iconsdir}/hicolor/16x16/apps/kcmsambaconf.png
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -73,6 +72,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.14 2008-01-05 00:43:37 qboosh
+- fixed PIC issue at its source
+
Revision 1.13 2007-04-07 17:27:03 qboosh
- better pl; comment cleanup
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/ksambaplugin.spec?r1=1.13&r2=1.14&f=u
More information about the pld-cvs-commit
mailing list