[anjuta/f17] Remove a number of hacks accumulated over years
Kalev Lember
kalev at fedoraproject.org
Wed Mar 21 12:46:00 UTC 2012
commit 40303047d1a3afb59cedf030715a9994faf94132
Author: Kalev Lember <kalevlember at gmail.com>
Date: Mon Mar 19 13:04:33 2012 +0200
Remove a number of hacks accumulated over years
None of these are needed any more with current anjuta sources.
anjuta.spec | 45 +--------------------------------------------
1 files changed, 1 insertions(+), 44 deletions(-)
---
diff --git a/anjuta.spec b/anjuta.spec
index 828db21..2d8fe7b 100644
--- a/anjuta.spec
+++ b/anjuta.spec
@@ -77,62 +77,24 @@ Documentation for Anjuta DevStudio provided in DocBook format.
%prep
%setup -q -n %{name}-%{version}
-%if %{__isa_bits} == 64
- sed --in-place 's/\/usr\/lib\/pkgconfig/\/usr\/lib64\/pkgconfig/g' \
- ./plugins/project-wizard/druid.c
-%endif
-
# Suppress rpmlint error.
-chmod 644 `find . -name "*.c" -perm /111 -print`
-chmod 644 `find . -name "*.h" -perm /111 -print`
iconv --from-code ISO8859-1 --to-code UTF-8 ./THANKS \
--output THANKS.utf-8 && mv THANKS.utf-8 ./THANKS
-# Remove rpaths.
-sed -i.libdir_syssearch --expression \
- '/sys_lib_dlsearch_path_spec/s|/usr/lib |/usr/lib /usr/lib64 /lib /lib64 |' \
- configure
-sed -i.gecko --expression 's|-R\$GECKO_HOME||' configure
-
-# pangox.pc contains rpath linkage on PPC64.
-mkdir -p ./PKGCONFIG
-sed --expression 's|-R/usr/lib64||' %{_libdir}/pkgconfig/pangox.pc > \
- ./PKGCONFIG/pangox.pc
%build
-export PKG_CONFIG_PATH="./PKGCONFIG"
%configure --disable-schemas-compile --disable-silent-rules --disable-static \
--enable-gtk-doc --enable-introspection --enable-plugin-devhelp \
--enable-plugin-glade --enable-plugin-subversion \
- --enable-scrollkeeper \
- --docdir=%{_docdir}/%{name}-%{version} \
- --with-svn-lib=%{_libdir}
+ --enable-scrollkeeper
# Omit unused direct shared library dependencies.
sed --in-place --expression 's! -shared ! -Wl,--as-needed\0!g' libtool
make %{?_smp_mflags}
-# Strip unneeded translations from .mo files:
-# http://bugzilla.gnome.org/474987
-# pushd ./po
-# grep --invert-match \
-# ".*[.]desktop[.]in[.]in$\|.*[.]server[.]in[.]in$" \
-# POTFILES.in > POTFILES.keep
-# mv POTFILES.keep POTFILES.in
-# intltool-update --pot
-# for p in *.po; do
-# msgmerge $p %{name}.pot > $p.out
-# msgfmt -o `basename $p .po`.gmo $p.out
-# done
-# popd
%install
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-
-# Because $RPM_BUILD_ROOT%{_libdir}/libglade/2.0 is disabled below
-#mkdir -p $RPM_BUILD_ROOT%{_libdir}/libglade/2.0
-
# Installs zero-length files necessary for proper behaviour.
make install INSTALL="%{__install} -p" DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name "*.la" -delete
@@ -140,11 +102,6 @@ find $RPM_BUILD_ROOT -type f -name "*.la" -delete
# Use %%doc instead.
rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}
-# Some plugins (eg., Git and Subversion) need this.
-#pushd $RPM_BUILD_ROOT%{_libdir}/libglade/2.0
-# ln -s ../../libanjuta.so.0 libanjuta.so
-#popd
-
%find_lang %{name}
desktop-file-install --remove-key Encoding --vendor fedora --delete-original \
More information about the scm-commits
mailing list