rpms/fbpanel/devel fbpanel-4.12-libdir.patch, NONE, 1.1 fbpanel.desktop, NONE, 1.1 fbpanel.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Stefan Posdzich (cheekyboinc) fedora-extras-commits at redhat.com
Thu Jun 19 14:24:30 UTC 2008


Author: cheekyboinc

Update of /cvs/pkgs/rpms/fbpanel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29434/devel

Modified Files:
	.cvsignore sources 
Added Files:
	fbpanel-4.12-libdir.patch fbpanel.desktop fbpanel.spec 
	import.log 
Log Message:
Initial upload


fbpanel-4.12-libdir.patch:

--- NEW FILE fbpanel-4.12-libdir.patch ---
Patch by Robert Scheck <robert at fedoraproject.org> for fbpanel >= 4.12, to add some
changes to get the libraries into %{_libdir}/%{name} rather %{_datadir}/%{name}. It
doesn't change anything once --libdir parameter isn't used, so it has full legacy
compatibility and maybe gets applied by upstream as well.

Usage example of this patch for the use inside of a spec file e.g. for Fedora is:
  ./configure --prefix=%{_prefix} --libdir=%{_lib}
Don't use %{_libdir} for ./configure, just %{_lib} but everywhere else %{_libdir}
can be used. RPM macro %{_lib} normally expands to "lib" on 32 bit systems and to
"lib64" on 64 bit systems. The regular internal usage case is $(PREFIX)/$(LIBDIR)
which results in /usr/lib or /usr/lib64 depending on the CPU architecture.

--- fbpanel-4.12/configure			2007-04-24 14:40:45.000000000 +0200
+++ fbpanel-4.12/configure.libdir		2008-06-15 20:44:22.000000000 +0200
@@ -9,11 +9,13 @@
     echo "       <path>/bin - will hold all binaries"
     echo "       <path>/share/fbpanel - config files, pixmaps etc"
     echo "       default <path> is /usr"
+    echo "--libdir=[share|lib|lib64] - specify path for libraries"
     echo "--devel - enable devel mode: no optimization + debug symbols"
     echo "--cpu=[on|off] - enable linux cpu monitor plugin"
 }
 
 PREFIX="/usr"
+LIBDIR="share"
 PLUGIN_CPU="on"
 while [ $# -gt 0 ]; do
     case $1 in
@@ -24,6 +26,9 @@
         --prefix=*)
             PREFIX=`echo $1 | sed 's/--prefix=//'`
             ;;
+	--libdir=*)
+	    LIBDIR=`echo $1 | sed 's/--libdir=//'`
+	    ;;
 	--devel)
 	    DEVEL=1
 	    ;;
@@ -50,9 +55,11 @@
 echo "creating config.h"
 echo "//created by ./configure script" > config.h
 echo "#define PREFIX \"$PREFIX\"" >> config.h
+echo "#define LIBDIR \"$LIBDIR\"" >> config.h
 
 
 echo "creating Makefile.config"
 echo "PREFIX:=$PREFIX" > Makefile.config
+echo "LIBDIR:=$LIBDIR" >> Makefile.config
 echo "DEVEL:=$DEVEL" >> Makefile.config
 echo "PLUGIN_CPU:=$PLUGIN_CPU" >> Makefile.config
--- fbpanel-4.12/plugin.c			2007-04-21 13:28:25.000000000 +0200
+++ fbpanel-4.12/plugin.c.libdir		2008-06-15 20:46:51.000000000 +0200
@@ -137,7 +137,7 @@
         LOG(LOG_INFO, "   %s ... %s\n", str->str, m ? "ok" : "no");
         if (!m) {
             DBG("error is %s\n", g_module_error());
-            g_string_printf(str, "%s/share/fbpanel/plugins/%s.so", PREFIX, type);
+            g_string_printf(str, "%s/%s/fbpanel/plugins/%s.so", PREFIX, LIBDIR, type);
             m = g_module_open(str->str, G_MODULE_BIND_LAZY);
             LOG(LOG_INFO, "   %s ... %s\n", str->str, m ? "ok" : "no");
             if (!m) {
--- fbpanel-4.12/plugins/Makefile		2007-05-23 23:38:27.000000000 +0200
+++ fbpanel-4.12/plugins/Makefile.libdir	2008-06-15 20:45:01.000000000 +0200
@@ -47,9 +47,9 @@
 
 ifeq (0,$(STATIC_PLUGINS))
 install: 
-	install -d  $(PREFIX)/share/fbpanel/plugins
-	install -m 644 $(SOBJ) $(PREFIX)/share/fbpanel/plugins
+	install -d  $(PREFIX)/$(LIBDIR)/fbpanel/plugins
+	install -m 644 $(SOBJ) $(PREFIX)/$(LIBDIR)/fbpanel/plugins
 
 uninstall:
-	$(RM) -r $(PREFIX)/share/fbpanel/plugins/
+	$(RM) -r $(PREFIX)/$(LIBDIR)/fbpanel/plugins/
 endif
--- fbpanel-4.12/systray/Makefile		2007-04-21 13:28:25.000000000 +0200
+++ fbpanel-4.12/systray/Makefile.libdir	2008-06-15 20:47:16.000000000 +0200
@@ -41,10 +41,10 @@
 
 ifeq (0,$(STATIC_PLUGINS))
 install: 
-	install -d  $(PREFIX)/share/fbpanel/plugins
-	install -m 644 $(TARGET) $(PREFIX)/share/fbpanel/plugins
+	install -d  $(PREFIX)/$(LIBDIR)/fbpanel/plugins
+	install -m 644 $(TARGET) $(PREFIX)/$(LIBDIR)/fbpanel/plugins
 
 uninstall:
-	$(RM) $(PREFIX)/share/fbpanel/plugins/$(TARGET)
+	$(RM) $(PREFIX)/$(LIBDIR)/fbpanel/plugins/$(TARGET)
 
 endif


--- NEW FILE fbpanel.desktop ---
[Desktop Entry] 
Encoding=UTF-8
Name=fbpanel
Comment=A lightweight X11 desktop panel
Exec=fbpanel
Icon=fbpanel
Type=Application
Categories=Utility;

--- NEW FILE fbpanel.spec ---
Name:		fbpanel
Version:	4.12
Release:	5%{?dist}
Summary:	A lightweight X11 desktop panel

Group:		User Interface/Desktops
# %%{_bindir}/fbpanel and almost all plugins are under LGPLv2+
# Some plugins (cpu.so, pager.so, tray.so) are under GPLv2+
License:	LGPLv2+ and GPLv2+
URL:		http://fbpanel.sourceforge.net
Source:		http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tgz
Source1:	%{name}.desktop
Patch:		fbpanel-4.12-libdir.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gtk2-devel libXpm-devel libXmu-devel desktop-file-utils

%description
fbpanel is a lightweight X11 desktop panel. It works with any ICCCM / NETWM 
compliant window manager such as sawfish, metacity, openbox , xfwm4, or KDE.
It features tasklist, pager, launchbar, clock, menu and systray.

%prep
%setup -q
%patch -p1 -b .libdir

sed -i.stamp -e 's|install -m|install -p -m|' \
			Makefile */Makefile
sed -i.strip -e 's|strip|true strip|' \
			Makefile */Makefile

%build
./configure --prefix=%{_prefix} --libdir=%{_lib}
make \
	%{?_smp_mflags} \
	Q= \
	CFLAGS="${RPM_OPT_FLAGS}"


%install
rm -rf $RPM_BUILD_ROOT
make install PREFIX=$RPM_BUILD_ROOT%{_prefix}

# desktop file stuff
desktop-file-install --vendor="fedora"			\
	--dir=$RPM_BUILD_ROOT%{_datadir}/applications	\
	%{SOURCE1}
# icon
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/128x128/apps

install -p -m 0644 config/images/star.png	\
	$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/128x128/apps/%{name}.png


find $RPM_BUILD_ROOT%{_libdir}/%{name} -name \*.so -print0 | \
	xargs -0 chmod 0755

%clean
rm -rf $RPM_BUILD_ROOT


%post
touch --no-create %{_datadir}/icons/hicolor
if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi


%postun
touch --no-create %{_datadir}/icons/hicolor
if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi


%files
%defattr(-,root,root,-)
%doc CHANGELOG COPYING CREDITS README
%{_bindir}/%{name}
%{_libdir}/%{name}
%{_datadir}/%{name}
%{_mandir}/man1/%{name}.1.*
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/icons/hicolor/*/apps/%{name}.png


%changelog
* Wed Jun 18 2008 Stefan Posdzich <cheekyboinc at foresightlinux.org> - 4.12-5
- Add comment about the license
- Remove redundant Source2:

* Tue Jun 17 2008 Stefan Posdzich <cheekyboinc at foresightlinux.org> - 4.12-4
- Add correct url for Source:
- Add gtk-update-icon-cache
- Add timestamps
- Add missing debuginfo rpm
- Changed licence, MIT to LGPLv2+ and GPLv2+
- Remove unneeded ldconfig
- Remove redundant BuildRequires: atk-devel, pango-devel and cairo-devel

* Sun Jun 15 2008 Stefan Posdzich <cheekyboinc at foresightlinux.org> - 4.12-3
- Solved build failure and broken libs-patch with patch from Robert Scheck

* Sat Jun 07 2008 Stefan Posdzich <cheekyboinc at foresightlinux.org> - 4.12-2
- fixed rpmlint errors
- new .desktop file
- cleanup

* Sun May 25 2008 Stefan Posdzich <cheekyboinc at foresightlinux.org> - 4.12-1
- first version of the SPEC file


--- NEW FILE import.log ---
fbpanel-4_12-5_fc9:HEAD:fbpanel-4.12-5.fc9.src.rpm:1213885276


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fbpanel/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Jun 2008 00:31:13 -0000	1.1
+++ .cvsignore	19 Jun 2008 14:23:48 -0000	1.2
@@ -0,0 +1 @@
+fbpanel-4.12.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fbpanel/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Jun 2008 00:31:13 -0000	1.1
+++ sources	19 Jun 2008 14:23:48 -0000	1.2
@@ -0,0 +1 @@
+12528e7b2936a3548840fe01acaf39f5  fbpanel-4.12.tgz




More information about the fedora-extras-commits mailing list