rpms/cairo-dock/F-8 .cvsignore, 1.2, 1.3 cairo-dock.spec, 1.2, 1.3 sources, 1.2, 1.3
Mamoru Tasaka (mtasaka)
fedora-extras-commits at redhat.com
Mon May 26 12:53:24 UTC 2008
Author: mtasaka
Update of /cvs/extras/rpms/cairo-dock/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5670/F-8
Modified Files:
.cvsignore cairo-dock.spec sources
Log Message:
* Mon May 25 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- 1.5.6 rc3
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/F-8/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 16 May 2008 16:46:17 -0000 1.2
+++ .cvsignore 26 May 2008 12:52:44 -0000 1.3
@@ -1 +1 @@
-cairo-dock-sources-20080506.tar.bz2
+cairo-dock-sources-20080525.tar.bz2
Index: cairo-dock.spec
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/F-8/cairo-dock.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cairo-dock.spec 16 May 2008 16:52:31 -0000 1.2
+++ cairo-dock.spec 26 May 2008 12:52:44 -0000 1.3
@@ -1,5 +1,16 @@
-%define tarballver 20080506
-%define mainver 1.5.5.4
+# 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 20080525
+%define mainver 1.5.6
+%define build_gecko 1
+
+
+%define fedora_rel 0.1.rc3.date%{tarballver}
+
%if 0%{?fedora} >= 9
%define gecko_ver 1.9
@@ -10,7 +21,7 @@
Name: cairo-dock
Version: %{mainver}
-Release: 3.date%{tarballver}%{?dist}
+Release: %{fedora_rel}%{?dist}
Summary: Light eye-candy fully themable animated dock
Group: User Interface/Desktops
@@ -31,6 +42,7 @@
BuildRequires: glitz-glx-devel
BuildRequires: librsvg2-devel
BuildRequires: libxml2-devel
+BuildRequires: libXtst-devel
BuildRequires: perl(XML::Parser)
# For plug-ins
@@ -45,10 +57,12 @@
BuildRequires: Thunar-devel
# For plug-ins-gecko
+%if %{build_gecko} > 0
BuildRequires: gecko-devel %{?gecko_ver:= %{gecko_ver}}
%if 0%{?fedora} >= 9
BuildRequires: gecko-devel-unstable
%endif
+%endif
%description
An light eye-candy fully themable animated dock for any
@@ -67,6 +81,9 @@
Summary: Plug-ins files for %{name}
Group: User Interface/Desktops
Requires: %{name} = %{version}-%{release}
+%if %{build_gecko} == 0
+Obsoletes: %{name}-plug-ins-gecko < 1.5.5.4-4
+%endif
%description plug-ins
This package contains plug-ins files for %{name}.
@@ -101,6 +118,7 @@
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
@@ -109,6 +127,7 @@
%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
@@ -121,32 +140,8 @@
%{__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
@@ -181,6 +176,7 @@
%{__rm} -rf template/
# weblets
+%if %{build_gecko} > 0
%if 0%{?fedora} < 9
cd weblets/
%{__sed} -i.gecko \
@@ -188,6 +184,9 @@
configure.ac
cd ..
%endif
+%else
+%{__rm} -rf weblets/
+%endif
for dir in */
do
@@ -223,31 +222,18 @@
# 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 || 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
@@ -301,47 +287,45 @@
# 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
-
-# for debuginfo issue
-find $RPM_BUILD_ROOT%{_libdir}/%{name}/plug-in -name \*.so | \
- xargs %{__chmod} 0755
+%endif
popd # from opt/cairo-dock/trunk/cairo-dock
@@ -349,6 +333,7 @@
# 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 \
@@ -362,7 +347,7 @@
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
@@ -393,8 +378,7 @@
%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,-)
@@ -402,17 +386,21 @@
%files plug-ins -f lang-plug-ins.lang
%defattr(-,root,root,-)
-%{_libdir}/%{name}/plug-in/*
-%exclude %{_libdir}/%{name}/plug-in/*weblet*
-%exclude %{_libdir}/%{name}/plug-in/*xfce*
+%{_libdir}/%{name}/*
+%if %{build_gecko}
+%exclude %{_libdir}/%{name}/*weblet*
+%endif
+%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
%defattr(-,root,root,-)
@@ -420,6 +408,18 @@
%{_libdir}/pkgconfig/*.pc
%changelog
+* Mon May 25 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- 1.5.6 rc3
+
+* Sat May 17 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 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 <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.5.5.4-4.date20080506
+- F-10: don't build weblets plugin until xulrunner BR dependency is solved
+
* Sat May 17 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.5.5.4-3.date20080506
- Misc cleanup
- Remove template, upstream says this is not needed
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/F-8/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 16 May 2008 16:46:17 -0000 1.2
+++ sources 26 May 2008 12:52:44 -0000 1.3
@@ -1 +1 @@
-9d19e521c993478a14b48f6d103cfcfb cairo-dock-sources-20080506.tar.bz2
+5a4c04274f7ebfab5093ebdd801b5fbb cairo-dock-sources-20080525.tar.bz2
More information about the fedora-extras-commits
mailing list