some fixes;

F1ash · Jun 18, 2012 · 1e413d0 · 1e413d0
1 parent ca8f24f
commit 1e413d0
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -13,8 +13,14 @@ build:
 install: build
 	$(INSTALL) metadata.desktop $(DESTDIR)/$(KSERV)/$(APP_NAME).desktop
 	$(INSTALL) metadata.desktop $(DESTDIR)/$(KAPPS)/$(PLASMA)/$(APP_NAME)/metadata.desktop
-	$(INSTALL) $(CODE)/* $(DESTDIR)/$(KAPPS)/$(PLASMA)/$(APP_NAME)/$(CODE)/*
-	$(INSTALL) $(ICONS)/* $(DESTDIR)/$(KAPPS)/$(PLASMA)/$(APP_NAME)/$(ICONS)/*
+	$(INSTALL) $(CODE)/main.py $(DESTDIR)/$(KAPPS)/$(PLASMA)/$(APP_NAME)/$(CODE)/main.py
+	$(INSTALL) $(CODE)/AppletSettings.py $(DESTDIR)/$(KAPPS)/$(PLASMA)/$(APP_NAME)/$(CODE)/AppletSettings.py
+	$(INSTALL) $(CODE)/Blank.py $(DESTDIR)/$(KAPPS)/$(PLASMA)/$(APP_NAME)/$(CODE)/Blank.py
+	$(INSTALL) $(CODE)/Functions.py $(DESTDIR)/$(KAPPS)/$(PLASMA)/$(APP_NAME)/$(CODE)/Functions.py
+	$(INSTALL) $(ICONS)/alarm.png $(DESTDIR)/$(KAPPS)/$(PLASMA)/$(APP_NAME)/$(ICONS)/alarm.png
+	$(INSTALL) $(ICONS)/alarm1.png $(DESTDIR)/$(KAPPS)/$(PLASMA)/$(APP_NAME)/$(ICONS)/alarm1.png
+	$(INSTALL) $(ICONS)/alarm2.png $(DESTDIR)/$(KAPPS)/$(PLASMA)/$(APP_NAME)/$(ICONS)/alarm2.png
+	$(INSTALL) $(ICONS)/alarm_disabled.png $(DESTDIR)/$(KAPPS)/$(PLASMA)/$(APP_NAME)/$(ICONS)/alarm_disabled.png
 
 clean:
 	rm -rf $(DESTDIR)/$(KSERV)/$(APP_NAME).desktop

diff --git a/make-source-archive b/make-source-archive
@@ -11,3 +11,10 @@ find ./$APP_NAME-$APP_VERSION -type f -name *.pyc -exec rm -f {} \;
 find ./$APP_NAME-$APP_VERSION -type f -name *.pyo -exec rm -f {} \;
 tar cfj $APP_NAME-$APP_VERSION.tar.bz2 ./$APP_NAME-$APP_VERSION
 rm -rf ./$APP_NAME-$APP_VERSION
+
+
+RPMBUILD_ROOT=$(cat ~/.rpmmacros | grep "%_topdir" | awk '{print $3}' | sed s/\$HOME\)/\./)
+cp -f $APP_NAME-$APP_VERSION.tar.bz2 $RPMBUILD_ROOT/SOURCES
+cp -f ~/$APP_NAME/$APP_NAME.spec $RPMBUILD_ROOT/SPECS
+cd $RPMBUILD_ROOT/SPECS
+/usr/bin/rpmbuild -ba $APP_NAME.spec