diff --git a/.cvsignore b/.cvsignore index 633eba9..c7e0c4a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -cairo-dock-sources-20080506.tar.bz2 +cairo-dock-sources-svn990_trunk.tar.bz2 diff --git a/cairo-dock.spec b/cairo-dock.spec index 0e4a7b6..6caacef 100644 --- a/cairo-dock.spec +++ b/cairo-dock.spec @@ -1,6 +1,16 @@ -%define tarballver 20080506 +# For svn +# svn checkout svn://svn.berlios.de/cairo-dock/trunk +# mkdir -p opt/cairo-dock +# mv trunk opt/cairo-dock +# tar cjf cairo-dock-sources-%%{tag}.tar.bz2 opt/ + +%define tarballver svn990_trunk %define mainver 1.5.5.4 -%define build_gecko 0 +%define build_gecko 1 + + +%define fedora_rel 5 + %if 0%{?fedora} >= 9 %define gecko_ver 1.9 @@ -11,7 +21,7 @@ Name: cairo-dock Version: %{mainver} -Release: 4.date%{tarballver}%{?dist} +Release: %{fedora_rel}.%{tarballver}%{?dist} Summary: Light eye-candy fully themable animated dock Group: User Interface/Desktops @@ -32,6 +42,7 @@ BuildRequires: gtk2-devel BuildRequires: glitz-glx-devel BuildRequires: librsvg2-devel BuildRequires: libxml2-devel +BuildRequires: libXtst-devel BuildRequires: perl(XML::Parser) # For plug-ins @@ -107,6 +118,7 @@ Requires: gtk2-devel Requires: glitz-glx-devel Requires: librsvg2-devel Requires: libxml2-devel +Requires: libXtst-devel %description devel The %{name}-devel package contains libraries, build data, and header @@ -115,6 +127,7 @@ files for developing applications that use %{name}. %prep %setup -q -c find . -type d -name \.svn | sort -r | xargs %{__rm} -rf +find . -type d -name \*CVS | sort -r | xargs %{__rm} -rf # A. main pushd opt/cairo-dock/trunk/cairo-dock @@ -127,32 +140,8 @@ done %{__chmod} 0644 [A-Z]* # Makefile issue -touch data/main-dock.conf.in %{__sed} -i.debuglevel -e '/-O3/d' src/Makefile.am -# plug-in has arch-dependent files, must be moved under -# %_libdir -%{__sed} -i.plugin \ - -e '/CAIRO_DOCK_MODULES_DIR/s|$(pkgdatadir)/plug-in|%{_libdir}/%{name}/plug-in|' \ - src/Makefile.am - -# pkgconfig .pc file -# (also see above) -%{__sed} -i.plugin \ - -e 's|pluginsdir=.*|pluginsdir=%{_libdir}/%{name}/plug-in|' \ - %{name}.pc.in - -%{__sed} -i.libs \ - -e 's|\(Requires: \).*|\1|' \ - -e 's|@PACKAGE_.*@||' \ - %{name}.pc.in -%{__cat} configure.ac | \ - %{__sed} -n -e 's|^PKG_CHECK_MODULES([A-Z][A-Z]*, "\(.*\)")|\1|p' | \ - while read f - do - %{__sed} -i -e "/Requires:/s|^\(.*\)|\1 $f|" %{name}.pc.in -done - autoreconf -i -f # B. themes @@ -233,31 +222,19 @@ cd ../themes # C plug-ins cd ../plug-ins -ls -1 -d */ | \ - while read dir +for dir in */ do - FAIL=0 cd $dir - # Files to be installed under %%_libdir are all modules - # They are also installed under plugin dir and so all of these - # is unneeded - %configure \ - --libdir=/Trash || FAIL=1 - + %configure # Parallel make fails some times, but it is gerenally fast # so do parallel make anyway first %{__make} %{?_smp_mflags} -k || : - %{__make} -k && echo "SUCCESS: $dir" || FAIL=1 - if [ $FAIL -gt 0 ] ; then - echo "FAIL: $dir" - status=$((status+1)) - fi + %{__make} -k && echo "SUCCESS: $dir" || status=$((status+1)) + cd .. # "while read dir" does not save \$status value.... - echo $status > status.log done -status=`cat status.log` popd # from opt/cairo-dock/trunk/cairo-dock if [ $status -gt 0 ] ; then exit 1 ; fi @@ -311,56 +288,53 @@ popd # from $RPM_BUILD_ROOT # C plug-ins %{__rm} -rf $TOPDIR/{lang-plug-ins,lang-gecko} %{__mkdir} -p $TOPDIR/{lang-plug-ins,lang-gecko} + cd ../plug-ins -ls -1 -d */ | \ - while read dir +for dir in */ do cd $dir %{__make} install \ DESTDIR=$RPM_BUILD_ROOT \ INSTALL="%{__install} -p" - # read GETTEXT_PACKAGE - if [ ! -r po/Makefile.in ] ; then - cd .. - continue - fi - GETTEXT_MO_PACKAGES=`sed -n -e 's|^GETTEXT_PACKAGE = ||p' po/Makefile.in` - case $GETTEXT_MO_PACKAGES in - *weblet* ) - %find_lang $GETTEXT_MO_PACKAGES && \ - %{__mv} -f ${GETTEXT_MO_PACKAGES}.lang \ - $TOPDIR/lang-gecko/ - ;; - * ) - %find_lang $GETTEXT_MO_PACKAGES && \ - %{__mv} -f ${GETTEXT_MO_PACKAGES}.lang \ - $TOPDIR/lang-plug-ins/ - ;; - esac + # read GETTEXT_PACKAGE + if [ ! -r po/Makefile.in ] ; then cd .. + continue + fi + + GETTEXT_MO_PACKAGES=`sed -n -e 's|^GETTEXT_PACKAGE = ||p' po/Makefile.in` + case $GETTEXT_MO_PACKAGES in + *weblet* ) + %find_lang $GETTEXT_MO_PACKAGES && \ + %{__mv} -f ${GETTEXT_MO_PACKAGES}.lang \ + $TOPDIR/lang-gecko/ + ;; + * ) + %find_lang $GETTEXT_MO_PACKAGES && \ + %{__mv} -f ${GETTEXT_MO_PACKAGES}.lang \ + $TOPDIR/lang-plug-ins/ + ;; + esac + cd .. done # documents %{__cp} -p Applets.stable $TOPDIR/documents/main/ -# clean ups -%{__rm} -rf $RPM_BUILD_ROOT/Trash +# lang files cat $TOPDIR/lang-plug-ins/*.lang > $TOPDIR/lang-plug-ins.lang %if %{build_gecko} > 0 cat $TOPDIR/lang-gecko/*.lang > $TOPDIR/lang-gecko.lang %endif -# for debuginfo issue -find $RPM_BUILD_ROOT%{_libdir}/%{name}/plug-in -name \*.so | \ - xargs %{__chmod} 0755 - popd # from opt/cairo-dock/trunk/cairo-dock # final clean up # remove all unneeded files pushd $RPM_BUILD_ROOT %{__rm} -f ./%{_datadir}/%{name}/{ChangeLog.txt,License} +find .%{_libdir}/%{name} -name \*.la | xargs %{__rm} -f # just to suppress rpmlint... for f in \ @@ -374,7 +348,7 @@ for f in \ done set +x -for f in .%{_libdir}/%{name}/plug-in/*/* +for f in .%{_libdir}/%{name}/*/* do if head -n 1 $f 2>/dev/null | grep -q /bin/ ; then set -x @@ -405,8 +379,7 @@ popd # from $RPM_BUILD_ROOT %dir %{_datadir}/%{name}/themes/ %{_datadir}/%{name}/themes/_default_/ # only directory -%dir %{_libdir}/%{name} -%dir %{_libdir}/%{name}/plug-in +%dir %{_libdir}/%{name}/ %files themes %defattr(-,root,root,-) @@ -414,20 +387,20 @@ popd # from $RPM_BUILD_ROOT %files plug-ins -f lang-plug-ins.lang %defattr(-,root,root,-) -%{_libdir}/%{name}/plug-in/* +%{_libdir}/%{name}/* %if %{build_gecko} -%exclude %{_libdir}/%{name}/plug-in/*weblet* +%exclude %{_libdir}/%{name}/*weblet* %endif -%exclude %{_libdir}/%{name}/plug-in/*xfce* +%exclude %{_libdir}/%{name}/*xfce* %files plug-ins-xfce %defattr(-,root,root,-) -%{_libdir}/%{name}/plug-in/*xfce* +%{_libdir}/%{name}/*xfce* %if %{build_gecko} > 0 %files plug-ins-gecko -f lang-gecko.lang %defattr(-,root,root,-) -%{_libdir}/%{name}/plug-in/*weblet* +%{_libdir}/%{name}/*weblet* %endif %files devel @@ -436,6 +409,12 @@ popd # from $RPM_BUILD_ROOT %{_libdir}/pkgconfig/*.pc %changelog +* Sat May 17 2008 Mamoru Tasaka - 1.5.5.4-5.svn990_trunk +- Update to svn 990 +- 2 issues fixed in upstream + * plug-in directory moved to %%_libdir/%%name + * %%name.pc fixed + * Sat May 17 2008 Mamoru Tasaka - 1.5.5.4-4.date20080506 - F-10: don't build weblets plugin until xulrunner BR dependency is solved diff --git a/sources b/sources index 6908d07..51d22af 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9d19e521c993478a14b48f6d103cfcfb cairo-dock-sources-20080506.tar.bz2 +a2bd71da7140423b9d922625134f4dd5 cairo-dock-sources-svn990_trunk.tar.bz2